Fixed an issue where the node will attempt to reboot and will be stuck in an endless loop trying to kill safari and never rebooting. Fixing the issue by commenting out the kill browsers command and just sending a reboot command

Author: dima-groupon

CHANGELOG.txt

@@ -1,3 +1,4 @@
+1.3.3 - Fixed an issue where the node will attempt to reboot and will be stuck in an endless loop trying to kill safari and never rebooting. Fixing the issue by commenting out the kill browsers command and just sending a reboot command
 1.3.2 - Fixing a bug where node config JSON have all Integers converted to Doubles by Gson, which prevents nodes from starting
 1.3.1 - When sending config to HUB and reciving it from HUB, parse the config and pretty print it into the file
       - Performance improvment in the tests, don't try to ping hub asking for local box's info when in test mode

SeleniumGridExtras/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.groupon.selenium-grid-extras</groupId>
     <artifactId>SeleniumGridExtras</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
 
     <repositories>
         <repository>

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/grid/proxies/SetupTeardownProxy.java

@@ -44,6 +44,7 @@
 
 import com.groupon.seleniumgridextras.utilities.HttpUtility;
 
+import org.apache.log4j.Logger;
 import org.openqa.grid.common.exception.RemoteUnregisterException;
 
 
@@ -65,10 +66,12 @@ public class SetupTeardownProxy extends DefaultRemoteProxy implements TestSessio
   private boolean available = true;
   private boolean restarting = false;
 
+  private static Logger logger = Logger.getLogger(SetupTeardownProxy.class);
+
 
   public SetupTeardownProxy(RegistrationRequest request, Registry registry) {
     super(request, registry);
-    System.out.println("Attaching a node: " + getHost());
+    writeProxyLog("Attaching a node: " + getHost());
   }
 
   @Override
@@ -77,10 +80,9 @@ public TestSession getNewSession(Map<String, Object> requestedCapability) {
       if (timeToReboot() && !this.isBusy()) {
         setAvailable(false);
         setRestarting(false);
-        killBrowserForCurrentSession();
+//        killBrowserForCurrentSession();
         stopGridNode();
         rebootGridExtrasNode();
-        unregister();
       }
 
       if (isAvailable()) {
@@ -111,22 +113,23 @@ public void afterSession(TestSession session) {
   }
 
   protected void stopGridNode() {
-    System.out.println("Asking " + getHost() + " to stop grid node politely");
-    System.out.println(callRemoteGridExtras("stop_grid?port=5555"));
+    writeProxyLog("Asking " + getHost() + " to stop grid node politely");
+    writeProxyLog(callRemoteGridExtras("stop_grid?port=5555"));
+    unregister();
   }
 
   protected void killBrowserForCurrentSession() {
-    System.out.println("Asking " + getHost() + " to politely kill all browsers");
+    writeProxyLog("Asking " + getHost() + " to politely kill all browsers");
 
-    System.out.println(callRemoteGridExtras("kill_ie"));
-    System.out.println(callRemoteGridExtras("kill_safari"));
-    System.out.println(callRemoteGridExtras("kill_chrome"));
-    System.out.println(callRemoteGridExtras("kill_firefox"));
+    writeProxyLog(callRemoteGridExtras("kill_ie"));
+    writeProxyLog(callRemoteGridExtras("kill_safari"));
+    writeProxyLog(callRemoteGridExtras("kill_chrome"));
+    writeProxyLog(callRemoteGridExtras("kill_firefox"));
   }
 
   private void rebootGridExtrasNode() {
-    System.out.println("Asking SeleniumGridExtras to reboot " + getHost());
-    System.out.println(callRemoteGridExtras("reboot"));
+    writeProxyLog("Asking SeleniumGridExtras to reboot " + getHost());
+    writeProxyLog(callRemoteGridExtras("reboot"));
   }
 
   private JsonObject callRemoteGridExtras(String action) {
@@ -138,16 +141,17 @@ private JsonObject callRemoteGridExtras(String action) {
           new URL("http://" + getHost() + ":3000/" + action));
 
       JsonParser j = new JsonParser();
+      logger.info(returnedString);
       return (JsonObject) j.parse(returnedString);
 
     } catch (MalformedURLException e) {
-      System.out.println(e.toString());
+      writeProxyLog(e.toString());
       e.printStackTrace();
     } catch (ProtocolException e) {
-      System.out.println(e.toString());
+      writeProxyLog(e.toString());
       e.printStackTrace();
     } catch (IOException e) {
-      System.out.println(e.toString());
+      writeProxyLog(e.toString());
       e.printStackTrace();
     }
 
@@ -174,7 +178,7 @@ protected boolean timeToReboot() {
     int sessionLimit = status.get("node_sessions_limit").getAsInt();
 
     if (!nodeRunning) {
-      System.out.println("The grid node on " + getHost() + " does not seem to be running");
+      writeProxyLog("The grid node on " + getHost() + " does not seem to be running");
     } else if (sessionLimit == 0) {
       return false;
     } else if (sessionsStarted >= sessionLimit) {
@@ -190,7 +194,7 @@ protected boolean timeToReboot() {
   }
 
   public void unregister() {
-    System.out.println("Sending Un register command for " + getHost());
+    writeProxyLog("Sending Un register command for " + getHost());
     addNewEvent(new RemoteUnregisterException("Unregistering the node."));
   }
 
@@ -202,4 +206,8 @@ public void setRestarting(boolean restarting) {
     this.restarting = restarting;
   }
 
+  private void writeProxyLog(Object logItem){
+    logger.info(logItem.toString());
+  }
+
 }

SeleniumGridExtras/src/main/java/com/groupon/seleniumgridextras/utilities/FileIOUtility.java

@@ -55,9 +55,13 @@ public static String getAsString(File file) throws FileNotFoundException {
     return readString;
   }
 
-  public static void writeToFile(File filename, String content) throws IOException {
+  public static void writeToFile(File filename, String content, boolean append) throws IOException {
     logger.debug("Writing to " + filename.getAbsolutePath() + " following content\n" + content);
-    FileUtils.writeStringToFile(filename, content);
+    FileUtils.writeStringToFile(filename, content, append);
+  }
+
+  public static void writeToFile(File filename, String content) throws IOException {
+    FileIOUtility.writeToFile(filename, content, false);
   }
 
   public static void writePrettyJsonToFile(File filename, String content) throws IOException{