Changeset 5152

Timestamp:

2003-08-18T13:54:57+12:00 (21 years ago)

Author:

jmt12

Message:

Slight fix to ensure messages are written to logs properly

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (11 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -117 +117 @@
     listeners.remove(GShellListener.class, listener);
     }
-    /** Any threaded class must include this method to allow the thread body to be run.
-      */
-    private MessageDispatcher dispatcher;
+    /** Any threaded class must include this method to allow the thread body to be run. */
     public void run() {
-    // Create a new message dispatcher to merge then send off messages at a predetermined rate.
-    dispatcher = new MessageDispatcher(250);
-    dispatcher.start();
-    // Setup
     if(progress != null) {
         progress.start();
@@ -130 +124 @@
     // Determine if the user has asked for an outfile.
     String out_name = null;
+    BufferedOutputStream bos = null;
     if(type == IMPORT || type == BUILD) {
         if(type == IMPORT) {
@@ -138 +133 @@
         }
         if(out_name != null && out_name.length() > 0) {
-        File out = new File(out_name);
         try {
-            if(out.exists()) {
-            boolean append = true;
-            dispatcher.setBOS(new BufferedOutputStream(new FileOutputStream(out, append)));
-            }
+            bos = new BufferedOutputStream(new FileOutputStream(new File(out_name), true));
         } 
         catch (Exception error) {
-            error.printStackTrace();
+            Gatherer.printStackTrace(error);
         }
         }
@@ -159 +150 @@
         }
         ///ystem.err.println("Command: " + command);
-        dispatcher.standardMessage(type, get("Command") + ": " + command, status);
+        fireMessage(type, get("Command") + ": " + command, status);
                 
         Runtime rt = Runtime.getRuntime();
@@ -175 +166 @@
             progress.parse(eline);
             }
-            dispatcher.errorMessage(type, typeAsString(type) + "> " + eline, status);
+            if(bos != null) {
+            try {
+                bos.write(eline.getBytes(), 0, eline.length());
+            }
+            catch(Exception error) {
+                Gatherer.printStackTrace(error);
+            }
+            }
+            fireMessage(type, typeAsString(type) + "> " + eline, status);
         }
         if(stdinline != null) {
-            dispatcher.standardMessage(type, typeAsString(type) + "> " + stdinline, status);
+            fireMessage(type, typeAsString(type) + "> " + stdinline, status);
             
         }
@@ -189 +188 @@
         if(prcs.exitValue() == 0) {
             status = OK;
-            dispatcher.standardMessage(type, typeAsString(type) + "> " + get("Success"), status);
+            fireMessage(type, typeAsString(type) + "> " + get("Success"), status);
             
         } else {
             status = ERROR;
-            dispatcher.standardMessage(type, typeAsString(type) + "> " + get("Failure"), status);
+            fireMessage(type, typeAsString(type) + "> " + get("Failure"), status);
             
         }
@@ -199 +198 @@
         else {
         // I need to somehow kill the child process. Unfortunately Thread.stop() and Process.destroy() both fail to do this. But now, thankx to the magic of Michaels 'close the stream suggestion', it works fine (no it doesn't!)
+        prcs.getInputStream().close();
         prcs.getOutputStream().close();
         prcs.destroy();
@@ -211 +211 @@
     // If no error occured, and this was an import process we now extract any new metadata from the archive directory.
     if(status == OK && type == IMPORT) {
-        dispatcher.standardMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Start"), status);
+        fireMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Start"), status);
         new GreenstoneArchiveParser(progress, this);
-        dispatcher.standardMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Complete"), status);
+        fireMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Complete"), status);
     }
     // Tidy up.
@@ -221 +221 @@
     // We're done.
     fireProcessComplete(type, status);
-    dispatcher.processComplete();
-    dispatcher = null;
+    // Close bos
+    if(bos != null) {
+        try {
+        bos.close();
+        bos = null;
+        }
+        catch(Exception error) {
+        Gatherer.printStackTrace(error);
+        }
+    }
     }
     /** Method for firing a message to all interested listeners.
@@ -236 +244 @@
         ((GShellListener)concerned[i+1]).message(event);
         }
-    }
-    }
-
-    public void message(int type, String message, int status) {
-    if(dispatcher != null) {
-        dispatcher.standardMessage(type, message, status);
     }
     }
@@ -313 +315 @@
     return name;
     }
-
-    /** Rather than bombard the progress logs with thousands of individual lines, which can actually slow build times by 200-1000%, we instead fire off quarter second updates with all of the strings retrieved in that time, if any. */
-    private class MessageDispatcher
-    extends Thread {
-    private boolean process_complete;
-    private BufferedOutputStream bos;
-    private int last_status;
-    private int last_type;
-    private int wait_time;
-    private StringBuffer bos_buffer;
-    private StringBuffer buffer;
-    public MessageDispatcher(int wait_time) {
-        this.bos = bos;
-        this.bos_buffer = new StringBuffer();
-        this.buffer = new StringBuffer();
-        this.process_complete = false;
-        this.wait_time = wait_time;
-    }
-
-    public synchronized void errorMessage(int type, String message, int status) {
-        buffer.append(message);
-        buffer.append(StaticStrings.NEW_LINE_CHARACTER);
-        if(bos != null) {
-        bos_buffer.append(message);
-        bos_buffer.append(StaticStrings.NEW_LINE_CHARACTER);
-        }
-        last_status = status;
-        last_type = type;
-    }
-
-    public void processComplete() {
-        process_complete = true;
-    }
-
-    public void run() {
-        while(!process_complete) {
-        try {
-            wait(wait_time);
-        }
-        catch(Exception error) {
-        }
-        message();
-        }
-        // If there is still something in buffer send it
-        message();
-        // Close bos if it exists
-        if(bos != null) {
-        try {
-            bos.close();
-        }
-        catch (Exception e) {
-        }
-        }
-    }
-
-    public void setBOS(BufferedOutputStream bos) {
-        this.bos = bos;
-    }
-
-    public synchronized void standardMessage(int type, String message, int status) {
-        buffer.append(message);
-        buffer.append(StaticStrings.NEW_LINE_CHARACTER);
-        last_status = status;
-        last_type = type;
-    }
-
-    private synchronized void message() {
-        if(bos != null && bos_buffer.length() > 0) {
-        try {
-            bos.write(bos_buffer.toString().getBytes(), 0, bos_buffer.length());
-        }
-        catch(Exception error) {
-            Gatherer.printStackTrace(error);
-        }
-        bos_buffer.delete(0, bos_buffer.length());
-        }
-        if(buffer.length() > 0) {
-        fireMessage(last_type, buffer.toString(), last_status);
-        buffer.delete(0, buffer.length());
-        }
-    }
-    }
 }