Log.write

for logging
TATABOX42 · Apr 26, 2013 · 2ee6bf9 · 2ee6bf9
1 parent c297738
commit 2ee6bf9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 34 deletions.
diff --git a/src/main/java/water/Log.java b/src/main/java/water/Log.java
@@ -46,24 +46,6 @@ private static long getPid() {
     }
   }
 
-  public static void write(String s) {
-    write(s, null);
-  }
-
-  public static void write(Throwable t) {
-    write(null, t);
-  }
-
-  public static void write(String s, Throwable t) {
-    String stack = "";
-    if( t != null ) {
-      Writer result = new StringWriter();
-      PrintWriter printWriter = new PrintWriter(result);
-      t.printStackTrace(printWriter);
-      stack = result.toString();
-    }
-    System.out.println(s != null ? s + " " + stack : stack);
-  }
 
   // Print to the original STDERR & die
   public static void die(String s) {
@@ -106,7 +88,7 @@ public static void unwrap(PrintStream stream, String s) {
       stream.println(s);
   }
 
-  public static void log(File file, PrintStream stream) throws Exception {
+  private static void log(File file, PrintStream stream) throws Exception {
     BufferedReader reader = new BufferedReader(new FileReader(file));
     try {
       for( ;; ) {

diff --git a/src/main/java/water/api/RReader.java b/src/main/java/water/api/RReader.java
@@ -6,6 +6,7 @@
 
 import water.*;
 import water.H2O.H2OCountedCompleter;
+import water.util.L;
 import water.util.RString;
 
 import com.google.gson.JsonObject;
@@ -36,13 +37,12 @@ protected Response serve() {
     try {
       final Value source_ = source;
       final Key dest_ = dest;
-
       H2O.submitTask(new H2OCountedCompleter() {
           @Override public void compute2() {
             try {
               water.RReader.run(dest_, source_.openStream());
             } catch( IOException e ) {
-              Log.write(e);
+              L.err(e);
             }
           }
         });

diff --git a/src/main/java/water/sys/NodeHost.java b/src/main/java/water/sys/NodeHost.java
@@ -6,8 +6,8 @@
 import java.util.Arrays;
 
 import water.Boot;
-import water.Log;
 import water.sys.VM.Watchdog;
+import water.util.L;
 
 /**
  * Creates a node on a host.
@@ -103,7 +103,7 @@ public void run() {
             SSH.this.start();
             SSH.this.waitFor();
           } catch( Exception ex ) {
-            Log.write(ex);
+            L.err(ex);
           }
         }
       };

diff --git a/src/main/java/water/sys/VM.java b/src/main/java/water/sys/VM.java
@@ -8,6 +8,7 @@
 import org.apache.commons.lang.ArrayUtils;
 
 import water.Log;
+import water.util.L;
 
 /**
  * Executes code in a separate VM.
@@ -89,8 +90,7 @@ public boolean isAlive() {
     } catch( IllegalThreadStateException _ ) {
       return true;
     } catch( Exception ex ) {
-      Log.write(ex);
-      throw new RuntimeException(ex);
+      throw new RuntimeException(L.err(ex));
     }
   }
 
@@ -122,7 +122,7 @@ public void run() {
             b = -1;
           }
           if( b < 0 ) {
-            Log.write("Assuming parent done, exit(0)");
+            L.info("Assuming parent done, exit(0)");
             System.exit(0);
           }
         }

diff --git a/src/test/java/hex/KMeansTest.java b/src/test/java/hex/KMeansTest.java
@@ -1,9 +1,12 @@
 package hex;
 
-import java.util.Arrays;
 import java.util.Random;
+
 import org.junit.*;
+
 import water.*;
+import water.util.L;
+import water.util.L.Tag.Sys;
 
 public class KMeansTest extends TestUtil {
   @BeforeClass public static void stall() { stall_till_cloudsize(3); }
@@ -51,11 +54,9 @@ public void testGaussian(int rows) {
         cols[i] = i;
 
       ValueArray va = va_maker(source, (Object[]) array);
-      long start = System.currentTimeMillis();
+      Timer t = new Timer();
       KMeans.run(target, va, goals.length, 1e-6, cols);
-
-      long stop = System.currentTimeMillis();
-      Log.write("KMeansTest.testGaussian rows:" + rows + ", ms:" + (stop - start));
+      L.info(this,Sys.KMEAN," testGaussian rows:" + rows + ", ms:" + t);
       KMeans.KMeansModel res = UKV.get(target);
       double[][] clusters = res.clusters();
 
@@ -115,10 +116,9 @@ public void testAirline() {
     Key k1 = loadAndParseKey("h.hex","smalldata/airlines/allyears2k.zip");
     Key target = Key.make("air.kmeans");
     ValueArray va = UKV.get(k1);
-    long start = System.currentTimeMillis();
+    Timer t = new Timer();
     KMeans.run(target, va, 8, 1e-2, 0);
-    long stop = System.currentTimeMillis();
-    Log.write("KMeansTest.airlines: ms:" + (stop - start));
+    L.info(this,Sys.KMEAN,"ms= " + t);
     KMeans.KMeansModel res = UKV.get(target);
     double[][] clusters = res.clusters();
     UKV.remove(k1);