cleanup cycle needs to be persisted to allMap, since that's where it'…

…s read from in other places. this stuff needs some cleanup... changing logging message to reflect reality (gets displayed on a grid status page)
tinfoil · Feb 19, 2016 · 12f97a2 · 12f97a2
1 parent 047487f
commit 12f97a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/GridHubConfiguration.java
@@ -398,6 +398,7 @@ public void setPort(int port) {
 
   public void setCleanupCycle(int cleanupCycle) {
     this.cleanupCycle = cleanupCycle;
+    put(RegistrationRequest.CLEAN_UP_CYCLE, cleanupCycle);
   }
 
   public void setTimeout(int timeout) {

diff --git a/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java b/java/server/src/org/openqa/grid/selenium/proxy/DefaultRemoteProxy.java
@@ -88,12 +88,12 @@ public void beforeRelease(TestSession session) {
 
 
   public void afterCommand(TestSession session, HttpServletRequest request, HttpServletResponse response) {
-    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
+    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executed.");
   }
 
 
   public void beforeCommand(TestSession session, HttpServletRequest request, HttpServletResponse response) {
-    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executed.");
+    session.put("lastCommand", request.getMethod() + " - " + request.getPathInfo() + " executing ...");
   }
 
   private final HtmlRenderer renderer = new WebProxyHtmlRenderer(this);