Removed duplicate message about multiple local IPs

Author: cypof

build.xml

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 java -cp target/h2o.jar water.Boot -mainClass water.deploy.EC2 $@

h2o_on_ec2

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 java -cp target/h2o.jar water.Boot -mainClass water.deploy.Hadoop $@

h2o_on_hadoop

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -cp target/h2o.jar water.Boot $@

h2o_on_localhost

@@ -51,6 +51,7 @@ public final class H2O {
 
   // Myself, as a Node in the Cloud
   public static H2ONode SELF = null;
+  public static InetAddress SELF_ADDRESS;
 
   // Initial arguments
   public static String[] ARGS;
@@ -168,7 +169,7 @@ public int D( Key key, int repl ) {
     return Arrays.toString(_memary);
   }
 
-  public static InetAddress findInetAddressForSelf() throws Error {
+  private static InetAddress findInetAddressForSelf() throws Error {
     // Get a list of all valid IPs on this machine.  Typically 1 on Mac or
     // Windows, but could be many on Linux or if a hypervisor is present.
     ArrayList<InetAddress> ips = new ArrayList<InetAddress>();
@@ -515,6 +516,8 @@ public static void main( String[] args ) {
     ARGS = arguments.toStringArray();
     ParseDataset.PLIMIT = OPT_ARGS.pparse_limit;
 
+    SELF_ADDRESS = findInetAddressForSelf();
+
     //if (OPT_ARGS.rshell.equals("false"))
     Log.wrap(); // Logging does not wrap when the rshell is on.
 
@@ -632,7 +635,6 @@ private static void startupFinalize() {
   // function of the name. Parse node ip addresses from the filename.
   static void initializeNetworkSockets( ) {
     // Assign initial ports
-    InetAddress inet = findInetAddressForSelf();
     API_PORT = OPT_ARGS.port != 0 ? OPT_ARGS.port : DEFAULT_PORT;
 
     while (true) {
@@ -651,23 +653,23 @@ static void initializeNetworkSockets( ) {
         _apiSocket = new ServerSocket(API_PORT);
         _udpSocket = DatagramChannel.open();
         _udpSocket.socket().setReuseAddress(true);
-        _udpSocket.socket().bind(new InetSocketAddress(inet, UDP_PORT));
+        _udpSocket.socket().bind(new InetSocketAddress(SELF_ADDRESS, UDP_PORT));
         break;
       } catch (IOException e) {
         try { if( _apiSocket != null ) _apiSocket.close(); } catch( IOException ohwell ) { Log.err(ohwell); }
         Closeables.closeQuietly(_udpSocket);
         _apiSocket = null;
         _udpSocket = null;
         if( OPT_ARGS.port != 0 )
-          Log.die("On " + H2O.findInetAddressForSelf() +
+          Log.die("On " + SELF_ADDRESS +
               " some of the required ports " + (OPT_ARGS.port+0) +
               ", " + (OPT_ARGS.port+1) +
               " are not available, change -port PORT and try again.");
       }
       API_PORT += 2;
     }
-    SELF = H2ONode.self(inet);
-    Log.info("Internal communication uses port: ",UDP_PORT,"\nListening for HTTP and REST traffic on  http:/",inet,":"+_apiSocket.getLocalPort()+"/");
+    SELF = H2ONode.self(SELF_ADDRESS);
+    Log.info("Internal communication uses port: ",UDP_PORT,"\nListening for HTTP and REST traffic on  http:/",SELF_ADDRESS,":"+_apiSocket.getLocalPort()+"/");
 
     NAME = OPT_ARGS.name==null? System.getProperty("user.name") : OPT_ARGS.name;
     // Read a flatfile of allowed nodes

src/main/java/water/H2O.java

@@ -9,6 +9,7 @@
 
 import org.apache.commons.codec.binary.Base64;
 
+import water.H2O;
 import water.util.Log;
 
 /**
@@ -152,7 +153,7 @@ private static void forward(Process process, final String header, InputStream so
   }
 
   public static String localIP() {
-    return Log.HOST;
+    return H2O.SELF_ADDRESS.getHostAddress();
   }
 
   /**

src/main/java/water/deploy/VM.java

@@ -73,14 +73,13 @@ static public void wrap() {
   public final static Key LOG_KEY = Key.make("Log", (byte) 0, Key.BUILT_IN_KEY);
   /** Time from when this class loaded. */
   static final Timer time = new Timer();
-  /** IP address of the host */
-  public static final String HOST = H2O.findInetAddressForSelf().getHostAddress();
   /** Some guess at the process ID. */
   public static final long PID = getPid();
-  /** Hostname and process ID. */
-  private static final String HOST_AND_PID = "" + fixedLength(HOST + " ", 13) + fixedLength(PID + " ", 6);
+
   private static final String LONG_HEADERS_PARAM = "long_log_headers";
   private static final boolean LONG_HEADERS = System.getProperty(LONG_HEADERS_PARAM) != null;
+  private static String _longHeaders;
+
   private static boolean printAll;
   /** Per subsystem debugging flags. */
   static {
@@ -213,7 +212,13 @@ private String body(int headroom) {
     }
 
     private StringBuilder longHeader(StringBuilder buf) {
-      buf.append(when.startAsString()).append(" ").append(HOST_AND_PID);
+      String headers = _longHeaders;
+      if(headers == null) {
+        String host = H2O.SELF_ADDRESS != null ? H2O.SELF_ADDRESS.getHostAddress() : "";
+        headers = fixedLength(host + " ", 16) + fixedLength(PID + " ", 6);
+        if(H2O.SELF_ADDRESS != null) _longHeaders = headers;
+      }
+      buf.append(when.startAsString()).append(" ").append(headers);
       if( thread == null ) thread = fixedLength(Thread.currentThread().getName() + " ", 10);
       buf.append(thread);
       buf.append(kind.toString()).append(" ").append(sys.toString()).append(": ");

src/main/java/water/util/Log.java

@@ -61,7 +61,7 @@ public static void localCloud(int nodes, boolean inProcess, String[] args) {
   }
 
   public static void localMasterRemoteWorkers(String[] workers, String[] args) {
-    String local = H2O.findInetAddressForSelf().getHostAddress();
+    String local = H2O.SELF_ADDRESS.getHostAddress();
     int port = 54321;
     String flat = local + ":" + port + '\n';
     for( int i = 0; i < workers.length; i++ )