Changeset 28192 for gs2-extensions/parallel-building/trunk/src

Timestamp:

2013-08-30T09:21:30+12:00 (11 years ago)

Author:

jmt12

Message:

Need to still output Greenstone messages to log otherwise I can't determine IO start/stop

File:

• gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/HadoopGreenstoneIngest2.java (modified) (3 diffs)

gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/HadoopGreenstoneIngest2.java

@@ -294 +294 @@
       // - change working directory
       import_process_builder.directory(new File(gsdlhome));
-      // - close our output to the log before opening in the process
-      fw1.close();
 
       // - redirect STDERR to STDOUT for simplicity sake
@@ -314 +312 @@
       while ((line = import_process_br.readLine()) != null)
       {
+        // Write line to process log regardless
+        fw1.write(line + "\n");
+        // Now we check for sentinel strings in the output line
         Text output_key;
         Text output_value;
@@ -450 +451 @@
 
       // - write end time to log
-      FileWriter fw2 = new FileWriter(import_process_log, true);
       double end_time = ((double)System.currentTimeMillis())/1000;
-      fw2.write("[Completed:" + String.format("%.6f", end_time) + "]\n");
-      fw2.close();
+      fw1.write("[Completed:" + String.format("%.6f", end_time) + "]\n");
+      // - close our output to the log
+      fw1.close();
     }
     /** map(LongWritable,Text,Context) **/