[grid] A few semantic changes, no logical changes

diemol · diemol · commit 54312a8f7686 · 2022-01-20T08:44:26.000-05:00
[skip ci]
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -125,7 +125,7 @@ public class LocalDistributor extends Distributor implements Closeable {
   private final GridModel model;
   private final Map<NodeId, Node> nodes;
 
-  private final ScheduledExecutorService sessionService =
+  private final ScheduledExecutorService newSessionService =
     Executors.newSingleThreadScheduledExecutor(
       r -> {
         Thread thread = new Thread(r);
@@ -192,7 +192,7 @@ public LocalDistributor(
     // if sessionRequestRetryInterval is 0, we will schedule session creation every 10 millis
     long period = sessionRequestRetryInterval.isZero() ?
                   10 : sessionRequestRetryInterval.toMillis();
-    sessionService.scheduleAtFixedRate(
+    newSessionService.scheduleAtFixedRate(
       newSessionRunnable,
       sessionRequestRetryInterval.toMillis(),
       period,
@@ -592,7 +592,7 @@ public void close() {
     LOG.info("Shutting down Distributor executor service");
     purgeDeadNodes.shutdown();
     hostChecker.shutdown();
-    sessionService.shutdown();
+    newSessionService.shutdown();
   }
 
   private class NewSessionRunnable implements Runnable {
diff --git a/java/src/org/openqa/selenium/grid/log/LoggingFlags.java b/java/src/org/openqa/selenium/grid/log/LoggingFlags.java
@@ -17,6 +17,15 @@
 
 package org.openqa.selenium.grid.log;
 
+import static org.openqa.selenium.grid.config.StandardGridRoles.ALL_ROLES;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_CONFIGURE_LOGGING;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_HTTP_LOGS;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_LOG_LEVEL;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_PLAIN_LOGS;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_STRUCTURED_LOGS;
+import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_TRACING_ENABLED;
+import static org.openqa.selenium.grid.log.LoggingOptions.LOGGING_SECTION;
+
 import com.google.auto.service.AutoService;
 
 import com.beust.jcommander.Parameter;
@@ -27,15 +36,6 @@
 
 import java.util.Set;
 
-import static org.openqa.selenium.grid.config.StandardGridRoles.ALL_ROLES;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_CONFIGURE_LOGGING;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_HTTP_LOGS;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_LOG_LEVEL;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_PLAIN_LOGS;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_STRUCTURED_LOGS;
-import static org.openqa.selenium.grid.log.LoggingOptions.DEFAULT_TRACING_ENABLED;
-import static org.openqa.selenium.grid.log.LoggingOptions.LOGGING_SECTION;
-
 @SuppressWarnings("FieldMayBeFinal")
 @AutoService(HasRoles.class)
 public class LoggingFlags implements HasRoles {
@@ -65,10 +65,10 @@ public class LoggingFlags implements HasRoles {
   private Boolean httpLogs = DEFAULT_HTTP_LOGS;
 
   @Parameter(description = "File to write out logs. "
-                           + "Ensure the file path is compatible with the operating system's file path.\n"
-                           + "# Windows path example : \\\\path\\to\\file\\gridlog.log OR "
-                           + "C:\\path\\path\\to\\file\\gridlog.log \n"
-                           + "# Linux/Unix/MacOS path example : /path/to/file/gridlog.log \n"
+                           + "Ensure the file path is compatible with the operating system's file path. "
+                           + "Windows path example: \\\\path\\to\\file\\gridlog.log OR "
+                           + "C:\\path\\path\\to\\file\\gridlog.log "
+                           + "Linux/Unix/MacOS path example: /path/to/file/gridlog.log"
     , names = "--log", arity = 1)
   @ConfigValue(section = LOGGING_SECTION, name = "log-file", example = {"'\\\\path\\to\\file\\gridlog.log'",
                                                                         "'C:\\path\\path\\to\\file\\gridlog.log'",
diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerFlags.java b/java/src/org/openqa/selenium/grid/node/docker/DockerFlags.java
@@ -59,8 +59,8 @@ public class DockerFlags implements HasRoles {
 
   @Parameter(
     names = {"--docker", "-D"},
-    description = "Docker configs which map image name to stereotype capabilities (example " +
-                  "`-D selenium/standalone-firefox:latest '{\"browserName\": \"firefox\"}'`)",
+    description = "Docker configs which map image name to stereotype capabilities (example: " +
+                  "-D selenium/standalone-firefox:latest '{\"browserName\": \"firefox\"}')",
     arity = 2,
     variableArity = true,
     splitter = NonSplittingSplitter.class)
