Fix process launcher

Author: ngallagher

snap-agent/src/main/java/org/snapscript/agent/ConsoleConnector.java

@@ -13,8 +13,8 @@ public static void connect(ProcessEventChannel channel, String process) {
       try {
          ProcessEventStream errorAdapter = new ProcessEventStream(WRITE_ERROR, channel, System.err, process);
          ProcessEventStream outputAdapter = new ProcessEventStream(WRITE_OUTPUT, channel, System.out, process);
-         PrintStream outputStream = new PrintStream(outputAdapter, false, "UTF-8");
-         PrintStream errorStream = new PrintStream(errorAdapter, false, "UTF-8");
+         PrintStream outputStream = new PrintStream(outputAdapter, true, "UTF-8");
+         PrintStream errorStream = new PrintStream(errorAdapter, true, "UTF-8");
 
          // redirect all output to the streams
          System.setOut(outputStream);

snap-develop/src/main/java/org/snapscript/develop/ProcessLauncher.java

@@ -31,13 +31,14 @@ public ProcessLauncher(ProcessEventChannel channel, ConsoleLogger logger, Worksp
    public ProcessDefinition launch(ProcessConfiguration configuration) throws Exception {
       int remote = channel.port();
       int httpPort = configuration.getPort();
+      String httpHost = configuration.getHost();
       String level = logger.getLevel();
       String name = generator.generate();
       String port = String.valueOf(remote);
       String home = System.getProperty("java.home");
       String java = String.format("%s%sbin%sjava", home, File.separatorChar, File.separatorChar);
-      String resources = String.format("http://localhost:%s/resource/", httpPort);
-      String classes = String.format("http://localhost:%s/class/", httpPort);
+      String resources = String.format("http://%s:%s/resource/", httpHost, httpPort);
+      String classes = String.format("http://%s:%s/class/", httpHost, httpPort);
       Map<String, String> variables = configuration.getVariables();
       List<String> arguments = configuration.getArguments();
       String launcher = RemoteProcessLauncher.class.getCanonicalName();

snap-develop/src/main/java/org/snapscript/develop/ProcessManager.java

@@ -133,10 +133,11 @@ public boolean ping(String process, long time) {
       return false;
    }
 
-   public void start(int port) {
+   public void start(String host, int port) {
       loader.load(configuration);
+      configuration.setHost(host);
       configuration.setPort(port);
-      pool.start(port);
+      pool.start(host, port);
    }
 
    public void launch() {

snap-develop/src/main/java/org/snapscript/develop/ProcessPool.java

@@ -106,11 +106,11 @@ public void remove(ProcessEventListener listener) {
       }
    }
 
-   public void start(int port) { // http://host:port/project
+   public void start(String host, int port) { // http://host:port/project
       try {
          manager.start();
          server.start();
-         pinger.start(port);
+         pinger.start(host, port);
       } catch(Exception e) {
          logger.info("Could not start pool on port " + port, e);
       }
@@ -313,10 +313,11 @@ public ProcessAgentPinger(long frequency) {
          this.frequency = frequency;
       }
 
-      public void start(int port) {
+      public void start(String host, int port) {
          if(listen.compareAndSet(0, port)) {
             Thread thread = factory.newThread(this);
 
+            configuration.setHost(host);
             configuration.setPort(port);
             thread.start();
          }

snap-develop/src/main/java/org/snapscript/develop/ProcessServer.java

@@ -1,5 +1,7 @@
 package org.snapscript.develop;
 
+import java.net.InetSocketAddress;
+
 import org.snapscript.develop.http.WebServer;
 
 public class ProcessServer {
@@ -14,15 +16,17 @@ public ProcessServer(ProcessManager engine, WebServer server) {
 
    public void start() {
       try {
-         int port = server.start();
-         String project = String.format("http://localhost:%s/", port);
+         InetSocketAddress address = server.start();
+         int port = address.getPort();
+         String host = address.getHostString();
+         String project = String.format("http://%s:%s/", host, port);
          String script = CommandLineArgument.SCRIPT.getValue();
 
          if(script != null) {
             engine.launch(); // start a new process
          }
          System.err.println(project);
-         engine.start(port);
+         engine.start(host, port);
       } catch(Exception e) {
          e.printStackTrace();
       }

snap-develop/src/main/java/org/snapscript/develop/configuration/ProcessConfiguration.java

@@ -10,6 +10,7 @@ public class ProcessConfiguration {
    private Map<String, String> variables;
    private List<String> arguments;
    private String classPath;
+   private String host;
    private int port;
 
    public ProcessConfiguration() {
@@ -41,6 +42,14 @@ public void setClassPath(String classPath) {
       this.classPath = classPath;
    }
 
+   public String getHost() {
+      return host;
+   }
+
+   public void setHost(String host) {
+      this.host = host;
+   }
+   
    public int getPort() {
       return port;
    }

snap-develop/src/main/java/org/snapscript/develop/http/WebAddress.java

@@ -0,0 +1,31 @@
+package org.snapscript.develop.http;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+public class WebAddress {
+
+   private final int port;
+   
+   public WebAddress(int port) {
+      this.port = port;
+   }
+   
+   public InetSocketAddress getLocalAddress() {
+      try {
+         return new InetSocketAddress(port);
+      }catch(Exception e){
+         return new InetSocketAddress(port);
+      }
+   }
+   
+   public InetSocketAddress getExternalAddress() {
+      try {
+         String host = InetAddress.getLocalHost().getHostAddress();
+         return new InetSocketAddress(host, port);
+      }catch(Exception e){
+         return new InetSocketAddress(port);
+      }
+   }
+}

snap-develop/src/main/java/org/snapscript/develop/http/WebServer.java

@@ -13,22 +13,32 @@
 public class WebServer {
 
    private final SocketProcessor server;
-   private final SocketAddress address;
    private final Connection connection;
+   private final WebAddress address;
 
    public WebServer(Container container, int port) throws IOException {
       this.server = new ContainerSocketProcessor(container, 10);
       this.connection = new SocketConnection(server);
-      this.address = new InetSocketAddress(port);
+      this.address = new WebAddress(port);
    }
 
-   public int start() throws IOException {
+   public InetSocketAddress start() throws IOException {
 	   try {
-		   InetSocketAddress local = (InetSocketAddress)connection.connect(address);
-		   return local.getPort();
+	      InetSocketAddress external = address.getExternalAddress();
+	      InetSocketAddress internal = address.getLocalAddress();
+         InetSocketAddress local = (InetSocketAddress)connection.connect(internal);
+         String host = external.getHostString();
+         int port = local.getPort();
+         
+         return new InetSocketAddress(host, port);
 	   } catch (IOException ex) {
-		   System.err.println("Failed to connect to: " + address);
-		   throw ex;
+	      try {
+	         SocketAddress local = address.getLocalAddress();
+            return (InetSocketAddress)connection.connect(local);
+	      }catch(Exception e) {
+	         System.err.println("Failed to connect to: " + address);
+		      throw ex;
+	      }
 	   }
    }
 

snap-develop/src/main/resources/context/develop.xml

@@ -229,7 +229,7 @@
 
   <bean id="WebContainer" class="org.snapscript.develop.http.WebContainer">
     <constructor-arg ref="WebSocketContainer" />
-    <constructor-arg value="Snap/1.0" />
+    <constructor-arg value="Apache/2.2.14 (Win32)" />
   </bean>
 
   <bean id="WebServer" class="org.snapscript.develop.http.WebServer">

snap-develop/src/main/resources/resource/css/breakpoints.css

@@ -2,7 +2,7 @@
     font-family: "Lucida Console", sans-serif; 
     font-size: 0.9em;   
     background-color: #ffffff;
-    border-radius: 4px;    
+    /*border-radius: 4px;*/    
  	border-style: solid;
     border-width: 1px;
     border-color: #c0c0c0;