[checkmk-commits] Check_MK Git: check_mk: Proceeding with updates after an error

Module: check_mk Branch: master Commit: 3d71dd6370816746ffa54e6781d1583abc6edbef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d71dd63708167… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Thu Aug 25 11:06:51 2011 +0200 Proceeding with updates after an error --- web/htdocs/js/check_mk.js | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 00364d9..b8d8baa 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -597,13 +597,6 @@ function startReloadTimer(url) { gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); } -function handleContentReloadError(data, statusCode) { - var o = document.getElementById('data_container'); - o.innerHTML = '<div class=error>Update failed (' + statusCode - + '). The shown data might be outdated</div>' + o.innerHTML; - o = null; -} - function updateHeaderTime() { var oTime = document.getElementById('headertime'); if(!oTime) @@ -640,6 +633,16 @@ function handleContentReload(_unused, code) { startReloadTimer(''); } +function handleContentReloadError(data, statusCode) { + var o = document.getElementById('data_container'); + o.innerHTML = '<div class=error>Update failed (' + statusCode + + '). The shown data might be outdated</div>' + o.innerHTML; + o = null; + + // Continue update after the error + startReloadTimer(''); +} + function handleReload(url) { // FiXME: Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. // In dem Fall wird die aktuelle URL aus "window.location.href" geholt, für den Refresh