[grid] Logging Node url instead of id, better readability

diemol · diemol · commit 941b8a913be3 · 2022-02-21T22:42:14.000+01:00
[skip ci]
diff --git a/java/src/org/openqa/selenium/grid/distributor/GridModel.java b/java/src/org/openqa/selenium/grid/distributor/GridModel.java
@@ -91,7 +91,7 @@ public void add(NodeStatus node) {
       while (iterator.hasNext()) {
         NodeStatus next = iterator.next();
 
-        // If the ID the same and the URI is the same, use the same
+        // If the ID and the URI are the same, use the same
         // availability as the version we have now: we're just refreshing
         // an existing node.
         if (next.getNodeId().equals(node.getNodeId()) && next.getExternalUri().equals(node.getExternalUri())) {
@@ -106,7 +106,7 @@ public void add(NodeStatus node) {
           return;
         }
 
-        // If the URI is the same but NodeId is different then the Node has restarted
+        // If the URI is the same but NodeId is different, then the Node has restarted
         if(!next.getNodeId().equals(node.getNodeId()) &&
            next.getExternalUri().equals(node.getExternalUri())) {
           LOG.info(String.format("Re-adding node with id %s and URI %s.", node.getNodeId(), node.getExternalUri()));
@@ -220,11 +220,11 @@ public void purgeDeadNodes() {
         Instant deadTime = lastTouched.plus(node.getHeartbeatPeriod().multipliedBy(PURGE_TIMEOUT_MULTIPLIER));
 
         if (node.getAvailability() == UP && lostTime.isBefore(now)) {
-          LOG.info(String.format("Switching node %s from UP to DOWN", node.getNodeId()));
+          LOG.info(String.format("Switching Node %s from UP to DOWN", node.getExternalUri()));
           replacements.put(node, rewrite(node, DOWN));
         }
         if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
-          LOG.info(String.format("Removing node %s that is DOWN for too long", node.getNodeId()));
+          LOG.info(String.format("Removing Node %s, DOWN for too long", node.getExternalUri()));
           toRemove.add(node);
         }
       }
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -317,7 +317,7 @@ public LocalDistributor add(Node node) {
       .withDelay(Duration.ofSeconds(15))
       .abortIf(result -> true);
 
-    LOG.log(getDebugLogLevel(), "Running initial health check for Node " + node.getId());
+    LOG.log(getDebugLogLevel(), "Running initial health check for Node " + node.getUri());
     Executors.newSingleThreadExecutor().submit(
       () -> Failsafe.with(initialHealthCheckPolicy).run(runnableHealthCheck::run));
 
@@ -347,7 +347,7 @@ private Runnable asRunnableHealthCheck(Node node) {
     return () -> {
       boolean checkFailed = false;
       Exception failedCheckException = null;
-      LOG.log(getDebugLogLevel(), "Running health check for " + node.getId());
+      LOG.log(getDebugLogLevel(), "Running health check for " + node.getUri());
 
       HealthCheck.Result result;
       try {
@@ -366,7 +366,7 @@ private Runnable asRunnableHealthCheck(Node node) {
           getDebugLogLevel(),
           String.format(
             "Health check result for %s was %s",
-            node.getId(),
+            node.getUri(),
             result.getAvailability()));
         model.setAvailability(id, result.getAvailability());
         model.updateHealthCheckCount(id, result.getAvailability());
diff --git a/java/src/org/openqa/selenium/grid/node/httpd/NodeServer.java b/java/src/org/openqa/selenium/grid/node/httpd/NodeServer.java
@@ -198,7 +198,7 @@ public NettyServer start() {
           .withDelay(nodeOptions.getRegisterCycle())
           .handleResultIf(result -> true);
 
-        LOG.info("Starting registration process for node id " + node.getId());
+        LOG.info("Starting registration process for Node " + node.getUri());
         Executors.newSingleThreadExecutor().submit(() -> {
           Failsafe.with(registrationPolicy).run(
             () -> {
