--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionPanel.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionPanel.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -49,7 +49,6 @@

      */
     ConnectionPanel() {
 

-        //super(new Insets(1, 1, 1, 1), true);

         super(new Insets(5, 5, 5, 5), true);
 
         setLayout(new GridBagLayout());

@@ -79,6 +78,7 @@

      * @return The connection parameters.
      */
     void cache() {

+        //System.out.println("cache ...");

         connectionParameters = new EtConnectionParameters();
         connectionParameters.setBufferName(etNameField.getText());
         connectionParameters.setHost(hostField.getText());

@@ -93,6 +93,7 @@

         connectionParameters.setWaitMode(getWaitMode());
         connectionParameters.setWaitTime(Integer.parseInt(waitTimeField.getText()));
         connectionParameters.setPreScale(Integer.parseInt(prescaleField.getText()));

+        //System.out.println("cache done");

     }
     
     void revert() {

@@ -251,6 +252,7 @@

      * @param file The properties file.
      */
     void loadPropertiesFile(File file) {

+        //System.out.println("loadPropertiesFile ...");

         Properties prop = new Properties();
         try {
             prop.load(new FileInputStream(file));

@@ -268,10 +270,13 @@

             waitTimeField.setText(prop.getProperty("waitTime"));
             prescaleField.setText(prop.getProperty("prescale"));
         } catch (FileNotFoundException e) {

+            e.printStackTrace();

             showErrorDialog(e.getLocalizedMessage());
         } catch (IOException e) {

+            e.printStackTrace();

             showErrorDialog(e.getLocalizedMessage());
         }
         cache();

+        //System.out.println("done with loadPropertiesFile");

     }
 }

\ No newline at end of file

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionStatusPanel.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionStatusPanel.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -104,7 +104,7 @@

         add(new JSeparator(SwingConstants.HORIZONTAL), c);
         
         // Set default status.

-        setStatus(ConnectionStatus.DISCONNECTED);

+        //setStatus(ConnectionStatus.DISCONNECTED);

     }
 
     /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/JobPanel.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/JobPanel.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -30,7 +30,7 @@

 class JobPanel extends FieldsPanel {
 
     private JTextField detectorNameField;

-    private JCheckBox disconnectOnErrorCheckBox;

+    //private JCheckBox disconnectOnErrorCheckBox;

     private JTextField eventBuilderField;
     private JComboBox<?> steeringTypeComboBox;
     private JTextField steeringFileField;

@@ -75,7 +75,7 @@

         setLayout(new GridBagLayout());
 
         pauseModeCheckBox = addCheckBox("Pause mode", false, true);

-        disconnectOnErrorCheckBox = addCheckBox("Disconnect on error", false, true);

+        //disconnectOnErrorCheckBox = addCheckBox("Disconnect on error", false, true);

         logLevelComboBox = addComboBox("Log Level", this.logLevels);
         logLevelComboBox.setActionCommand(MonitoringCommands.SET_LOG_LEVEL);
         steeringTypeComboBox = addComboBox("Steering Type", steeringTypes);  

@@ -330,9 +330,9 @@

      * Get the disconnect on error setting from the check box.
      * @return The disconnect on error setting.
      */

-    boolean disconnectOnError() {
-        return disconnectOnErrorCheckBox.isSelected();
-    }

+    //boolean disconnectOnError() {
+    //    return disconnectOnErrorCheckBox.isSelected();
+    //}

         
     /**
      * Get the log to file setting.

@@ -370,13 +370,13 @@

      * Set whether to disconnect if errors occur.
      * @param b The disconnect on error setting.
      */

-    private void setDisconnectOnError(final boolean b) {
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                disconnectOnErrorCheckBox.setSelected(b);
-            }
-        });        
-    }

+    //private void setDisconnectOnError(final boolean b) {
+    //    SwingUtilities.invokeLater(new Runnable() {
+    //        public void run() {
+    //            disconnectOnErrorCheckBox.setSelected(b);
+    //        }
+    //    });        
+    //}

         
     /**
      * Set the steering type.

@@ -492,7 +492,7 @@

     void cache() {
         settings = new JobSettings();
         settings.pauseMode = pauseMode();

-        settings.disconnectOnError = disconnectOnError();

+        //settings.disconnectOnError = disconnectOnError();

         settings.logLevel = getLogLevel();
         settings.steeringType = getSteeringType();
         settings.steeringFile = getSteeringFile();

@@ -519,7 +519,7 @@

     void setJobSettings(JobSettings settings) {
         this.settings = settings;
         enablePauseMode(settings.pauseMode);

-        setDisconnectOnError(settings.disconnectOnError);

+        //setDisconnectOnError(settings.disconnectOnError);

         setLogLevel(settings.logLevel);
         setSteeringType(settings.steeringType);
         setSteeringFile(settings.steeringFile);

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/RunPanel.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/RunPanel.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -114,7 +114,7 @@

         }
         
         public void endJob() {

-            System.out.println("RunPanelUpdater.endJob");

+            //System.out.println("RunPanelUpdater.endJob");

             timer.cancel();
             timer.purge();
         }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SettingsDialog.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SettingsDialog.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -18,7 +18,6 @@

         setTitle("Settings");
         setContentPane(settingsPanel);
         setResizable(false);

-        setDefaultCloseOperation(HIDE_ON_CLOSE);

         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         setModalityType(ModalityType.APPLICATION_MODAL);
         pack();

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EventProcessingThread.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EventProcessingThread.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -7,7 +7,7 @@

 public class EventProcessingThread extends Thread {
     
     EventProcessingChain processing;

-    

+           

     public EventProcessingThread(EventProcessingChain processing) {
         super("EventProcessingThread");
         this.processing = processing;

@@ -22,7 +22,9 @@

         try {
             processing.loop();
         } catch (Exception e) {

+            System.out.println("EventProcessingThread caught exception...");

             e.printStackTrace();

+            return; // DEBUG

         }
     }
 }

\ No newline at end of file

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -114,7 +114,7 @@

             if (stopOnEndRun)
                 throw new EndRunException("EVIO end event received, and stop on end run is enabled.");
         

-        System.out.println("done with EvioProcessingStep.processEvent");

+        //System.out.println("done with EvioProcessingStep.processEvent");

     }
     
     /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoop.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoop.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -1,5 +1,7 @@

 package org.hps.monitoring.record.composite;
 

+import java.io.IOException;
+

 import org.freehep.record.loop.DefaultRecordLoop;
 import org.freehep.record.source.RecordSource;
 

@@ -37,4 +39,16 @@

     public void addProcessor(CompositeRecordProcessor processor) {
         adapter.addProcessor(processor);
     }

+    
+    protected void handleClientError(Throwable x) {
+        //System.out.println("CompositeRecordLoop.handleClientError - handling error " + x.getClass().getCanonicalName());
+        //x.printStackTrace();
+        throw new RuntimeException("Error during event processing.", x);
+    }
+
+    protected void handleSourceError(Throwable x) {
+        //System.out.println("CompositeRecordLoop.handleSourceError - handling error " + x.getClass().getCanonicalName());        
+        //x.printStackTrace();
+        throw new RuntimeException("Error during event processing.", x);
+    }        

 }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtConnection.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtConnection.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -79,7 +79,7 @@

      * Cleanup the ET connection.
      */
     public void cleanup() {

-        boolean debug = true;

+        boolean debug = false;

         try {
             if (!sys.alive()) {
                 throw new RuntimeException("EtSystem is not alive!");

@@ -160,8 +160,8 @@

     
     /**
      * Read EtEvent objects from the ET ring.  

-     * Preserve all specific Exception types in throws clause so caller
-     * can implement their own error and state handling.

+     * Preserve all specific Exception types in the throws clause so caller
+     * may implement their own error and state handling.

      * @return
      * @throws IOException
      * @throws EtException

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventAdapter.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventAdapter.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -26,6 +26,18 @@

         }
     }
     

+    // NOTE: This is called between every execution of the GO_N command!!!
+    public void suspend(LoopEvent event) {
+        //System.out.println("EtEventAdapter.suspend");        
+        if (event.getException() != null) {
+            //System.out.println("current error: " + event.getException().getMessage());
+            //System.out.println("ending job from suspend");
+            for (EtEventProcessor processor : processors) {
+                processor.endJob();
+            }
+        }
+    }
+    

     @Override
     public void start(LoopEvent event) {
         for (EtEventProcessor processor : processors) {

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventLoop.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventLoop.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -1,7 +1,5 @@

 package org.hps.monitoring.record.etevent;
 

-import java.io.IOException;
-

 import org.freehep.record.loop.DefaultRecordLoop;
 import org.freehep.record.source.RecordSource;
 import org.jlab.coda.et.EtEvent;

@@ -38,4 +36,18 @@

         }        
         super.setRecordSource(source);
     }

+    
+    protected void handleClientError(Throwable x) {
+        if (x != null) {
+            //x.printStackTrace();
+            throw new RuntimeException(x);
+        }
+    }
+
+    protected void handleSourceError(Throwable x) {
+        if (x != null) {
+            //x.printStackTrace();
+            throw new RuntimeException(x);
+        }
+    }     

 }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventSource.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/etevent/EtEventSource.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -101,9 +101,9 @@

     void readEtEvents() throws IOException {
         try {
             EtEvent[] mevs = connection.readEtEvents();

-            eventQueue.addAll(Arrays.asList(mevs));

+            eventQueue.addAll(Arrays.asList(mevs));        

         } catch (Exception e) {

-            throw new IOException(e);

+            throw new IOException("Error while reading ET events.", e);

         }
     }
 }

\ No newline at end of file

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioAdapter.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioAdapter.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -45,13 +45,25 @@

     
     @Override
     public void finish(LoopEvent event) {

-        System.out.println("EvioAdapter.finish");

+        //System.out.println("EvioAdapter.finish");

         for (EvioEventProcessor processor : processors) {

-            System.out.println(processor.getClass().getCanonicalName() + ".endJob");

+            //System.out.println(processor.getClass().getCanonicalName() + ".endJob");

             processor.endJob();
         }
     }    
     

+    // NOTE: This is called between every execution of the GO_N command!!!
+    public void suspend(LoopEvent event) {
+        //System.out.println("EvioAdapter.suspend");        
+        if (event.getException() != null) {
+            //System.out.println("current error: " + event.getException().getMessage());
+            //System.out.println("ending job from suspend");
+            for (EvioEventProcessor processor : processors) {
+                processor.endJob();
+            }
+        }
+    }
+    

     void addEvioEventProcessor(EvioEventProcessor processor) {
         processors.add(processor);
     }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioEventLoop.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioEventLoop.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -45,4 +45,18 @@

             throw (IOException) t;
         return getSupplied();
     }

+    
+    protected void handleClientError(Throwable x) {
+        if (x != null) {
+            x.printStackTrace();
+            throw new RuntimeException(x);
+        }
+    }
+
+    protected void handleSourceError(Throwable x) {
+        if (x != null) {
+            x.printStackTrace();
+            throw new RuntimeException(x);
+        }
+    }

 }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioFileProducer.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/evio/EvioFileProducer.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -25,7 +25,6 @@

  *
  */
 // TODO: Add option to set number of events in the put array.

-// TODO: Move to a sub-package.

 public class EvioFileProducer {
 
     private List<File> evioFiles = new ArrayList<File>();

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -150,7 +150,6 @@

 
     @Override
     public void stop() { 

-        System.out.println("SystemStatistics.stop");

         // Kill the Timer.
         if (timer != null)
             timer.cancel();

@@ -162,19 +161,19 @@

     @Override
     public void printSession(PrintStream ps) {
         ps.println("session statistics ...");

-        ps.println("  getTimeElapsedMillis = " + this.getTimeElapsedMillis());
-        ps.println("  getCumulativeEvents = " + this.getCumulativeEvents());
-        ps.println("  getAverageEventsPerSecond = " + this.getAverageEventsPerSecond());
-        ps.println("  getAverageMegaBytesPerSecond = " + this.getAverageMbPerSecond());

+        ps.println("  timeElapsedMillis = " + this.getTimeElapsedMillis());
+        ps.println("  cumulativeEvents = " + this.getCumulativeEvents());
+        ps.println("  averageEventsPerSecond = " + this.getAverageEventsPerSecond());
+        ps.println("  averageMegaBytesPerSecond = " + this.getAverageMbPerSecond());

         
     }
     
     @Override
     public void printTick(PrintStream ps) {
         ps.println("tick statistics ...");

-        ps.println("  getTickElapsedMillis = " + this.getTickElapsedMillis());
-        ps.println("  getEventsSinceTick = " + this.getEventsInTick());
-        ps.println("  getBytesSinceTick = " + this.getBytesInTick());

+        ps.println("  tickElapsedMillis = " + this.getTickElapsedMillis());
+        ps.println("  eventsSinceTick = " + this.getEventsInTick());
+        ps.println("  bytesSinceTick = " + this.getBytesInTick());

     }
     
     @Override

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java	2014-07-03 20:21:06 UTC (rev 757)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatusImpl.java	2014-07-03 23:48:55 UTC (rev 758)
@@ -15,6 +15,7 @@

     List<SystemStatusListener> listeners = new ArrayList<SystemStatusListener>();
     String systemName = "";
     String description = "";

+    boolean masked;

     
     SystemStatusImpl(String systemName, String description) {
         this.systemName = systemName;

@@ -47,7 +48,8 @@

         this.code = code;
         this.message = message;
         setCurrentTime();

-        notifyListeners();

+        if (!isMasked())
+            notifyListeners();

     }
 
     @Override

@@ -72,4 +74,14 @@

     private void setCurrentTime() {
         this.lastChangedMillis = System.currentTimeMillis();
     }

+ 
+    @Override
+    public void setMasked(boolean masked) {
+        this.masked = masked;
+    }
+    
+    @Override
+    public boolean isMasked() {
+        return masked;
+    }

 }