server: Improving grid node reporting to the console

Author: barancev

Diff for: java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java

@@ -53,13 +53,14 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.servlet.Servlet;
 
 public class SelfRegisteringRemote {
 
-  private static final Logger log = Logger.getLogger(SelfRegisteringRemote.class.getName());
+  private static final Logger LOG = Logger.getLogger(SelfRegisteringRemote.class.getName());
 
   private RegistrationRequest nodeConfig;
 
@@ -105,7 +106,9 @@ public void startRemoteServer() throws Exception {
         remoteControlConfiguration.setBrowserTimeoutInMs(browserTimeout);
       }
     }catch (Exception e) {
-      log.warning("error getting the parameters from the hub. The node may end up with wrong timeouts."+e.getMessage());
+      LOG.warning(
+        "error getting the parameters from the hub. The node may end up with wrong timeouts." + e
+          .getMessage());
     }
 
     server = new SeleniumServer(remoteControlConfiguration);
@@ -128,8 +131,8 @@ public void startRemoteServer() throws Exception {
           String path = "/" + servletClass.getSimpleName() + "/*";
           String clazz = servletClass.getCanonicalName();
           handler.addServlet(path, clazz);
-          log.info("started extra node servlet visible at : http://xxx:"
-              + nodeConfig.getConfiguration().get(RegistrationRequest.PORT) + "/extra" + path);
+          LOG.info("started extra node servlet visible at : http://xxx:"
+                   + nodeConfig.getConfiguration().get(RegistrationRequest.PORT) + "/extra" + path);
         }
       }
       extra.addHandler(handler);
@@ -184,20 +187,21 @@ public void sendRegistrationRequest() {
    * - register again every X ms is specified in the config of the node.
    */
   public void startRegistrationProcess() {
-    log.info("using the json request : " + nodeConfig.toJSON());
+    LOG.info("Using the json request : " + nodeConfig.toJSON());
 
     Boolean register = (Boolean) nodeConfig.getConfiguration().get(AUTO_REGISTER);
 
     if (!register) {
-      log.info("no registration sent ( " + AUTO_REGISTER + " = false )");
+      LOG.info("No registration sent ( " + AUTO_REGISTER + " = false )");
     } else {
       final int registerCycleInterval = nodeConfig.getConfigAsInt(RegistrationRequest.REGISTER_CYCLE, 0);
       if (registerCycleInterval > 0) {
         new Thread(new Runnable() { // Thread safety reviewed
 
               public void run() {
                 boolean first = true;
-                log.info("Starting auto register thread. Will try to register every " + registerCycleInterval + " ms.");
+                LOG.info("Starting auto register thread. Will try to register every "
+                         + registerCycleInterval + " ms.");
                 while (true) {
                   try {
                     boolean checkForPresence = true;
@@ -207,7 +211,7 @@ public void run() {
                     }
                     registerToHub(checkForPresence);
                   } catch (GridException e) {
-                    log.info("couldn't register this node : " + e.getMessage());
+                    LOG.info("Couldn't register this node: " + e.getMessage());
                   }
                   try {
                     Thread.sleep(registerCycleInterval);
@@ -248,7 +252,7 @@ private void registerToHub(boolean checkPresenceFirst) {
       HttpClient client = httpClientFactory.getHttpClient();
       try {
         URL registration = new URL(tmp);
-        log.info("Registering the node to hub :" + registration);
+        LOG.info("Registering the node to hub: " + registration);
 
         BasicHttpEntityEnclosingRequest r =
             new BasicHttpEntityEnclosingRequest("POST", registration.toExternalForm());
@@ -258,13 +262,15 @@ private void registerToHub(boolean checkPresenceFirst) {
         HttpHost host = new HttpHost(registration.getHost(), registration.getPort());
         HttpResponse response = client.execute(host, r);
         if (response.getStatusLine().getStatusCode() != 200) {
-          throw new RuntimeException("Error sending the registration request.");
+          throw new RuntimeException(String.format("The hub responded with %s:%s",
+                                                   response.getStatusLine().getStatusCode(),
+                                                   response.getStatusLine().getReasonPhrase()));
         }
       } catch (Exception e) {
-        throw new GridException("Error sending the registration request.", e);
+        throw new GridException("Error sending the registration request: " + e.getMessage());
       }
     } else {
-      log.fine("The node is already present on the hub. Skipping registration.");
+      LOG.fine("The node is already present on the hub. Skipping registration.");
     }
 
   }
@@ -312,12 +318,14 @@ private boolean isAlreadyRegistered(RegistrationRequest node) {
 
       HttpResponse response = client.execute(host, r);
       if (response.getStatusLine().getStatusCode() != 200) {
-        throw new GridException("Hub is down or not responding.");
+        throw new GridException(String.format("The hub responded with %s:%s",
+                                              response.getStatusLine().getStatusCode(),
+                                              response.getStatusLine().getReasonPhrase()));
       }
       JsonObject o = extractObject(response);
       return o.get("success").getAsBoolean();
     } catch (Exception e) {
-      throw new GridException("Hub is down or not responding: " + e.getMessage());
+      throw new GridException("The hub is down or not responding: " + e.getMessage());
     }
   }