From: Olivier Lamy <olamy@apache.org>
Date: Mon, 12 Mar 2012 22:26:46 +0000 (+0000)
Subject: [MRM-1580] system status page button to refresh all stats.
X-Git-Tag: archiva-1.4-M3~1042
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37d0206e9f044864efa8ffd3036cba5ea44b8d8e;p=archiva.git

[MRM-1580] system status page button to refresh all stats.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299909 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
index 493f1063c..6ebafb9b3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
@@ -593,6 +593,8 @@ $(function() {
     return [];
   }
 
+
+
   displayCacheEntries=function(){
     var divContent = $("#main-content #status_caches");
     divContent.html(smallSpinnerImg());
@@ -684,6 +686,32 @@ $(function() {
     });
   }
 
+  displayQueueEntries=function(){
+    var divContent = $("#main-content #status_queues");
+    divContent.html(smallSpinnerImg());
+    $.ajax("restServices/archivaServices/systemStatusService/queueEntries", {
+        type: "GET",
+        success: function(data){
+          var queueEntries=mapQueueEntries(data);
+          divContent.html($("#status_queues_tmpl" ).tmpl({queueEntries: queueEntries}));
+        }
+    });
+  }
+
+  displayServerTime=function(){
+    var divContent = $("#main-content #status_current_time");
+    divContent.html(smallSpinnerImg());
+    $.ajax("restServices/archivaServices/systemStatusService/currentServerTime/"+encodeURIComponent(usedLang()), {
+        type: "GET",
+        dataType: "text",
+        success: function(data){
+          var curTime=data;
+          $.log("currentServerTime:"+curTime);
+          divContent.html(curTime);
+        }
+    });
+  }
+
   displaySystemStatus=function(){
     screenChange();
     var mainContent=$("#main-content");
@@ -695,29 +723,22 @@ $(function() {
 
     displayMemoryUsage();
 
-    $.ajax("restServices/archivaServices/systemStatusService/currentServerTime/"+encodeURIComponent(usedLang()), {
-        type: "GET",
-        dataType: "text",
-        success: function(data){
-          var curTime=data;
-          $.log("currentServerTime:"+curTime);
-          mainContent.find("#status_current_time").html(curTime);
-        }
-    });
+    displayServerTime();
 
-    $.ajax("restServices/archivaServices/systemStatusService/queueEntries", {
-        type: "GET",
-        success: function(data){
-          var queueEntries=mapQueueEntries(data);
-          mainContent.find("#status_queues").html($("#status_queues_tmpl" ).tmpl({queueEntries: queueEntries}));
-        }
-    });
+    displayQueueEntries();
 
     displayScanningStats();
 
     displayCacheEntries();
   }
 
+  refreshSystemStatus=function(){
+    displayCacheEntries();
+    displayScanningStats();
+    displayMemoryUsage();
+    displayQueueEntries();
+    displayServerTime();
+  }
 
 
 });
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
index 7454f96d9..afd970a98 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
@@ -312,7 +312,7 @@
 <script id="system-status-main" type="text/html">
 
   <div class="page-header">
-    <h3>${$.i18n.prop('system-status.header.main')}</h3>
+    <h3>${$.i18n.prop('system-status.header.main')}&nbsp;<a href="#" onclick="refreshSystemStatus()"><img src="images/view-refresh-22-22.png"/></a></h3>
   </div>
   <div class="page-header">
     <h4>${$.i18n.prop('system-status.header.queues')}</h4>