Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/monitoring on MAIN
DefaultEtEventProcessor.java+9-71.4 -> 1.5
MonitoringApplication.java+2-21.32 -> 1.33
+11-9
2 modified files
fix issue with duplicate log messages by making loggers static

hps-java/src/main/java/org/lcsim/hps/monitoring
DefaultEtEventProcessor.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- DefaultEtEventProcessor.java	30 Apr 2012 13:36:56 -0000	1.4
+++ DefaultEtEventProcessor.java	30 Apr 2012 20:04:39 -0000	1.5
@@ -22,7 +22,7 @@
  * This class executes the default event processing chain for HPS Test Run monitoring: ET -> EVIO -> LCIO.
  * Its method {@link #process()} should be executed on a separate thread which can be joined until it dies.
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DefaultEtEventProcessor.java,v 1.4 2012/04/30 13:36:56 jeremy Exp $
+ * @version $Id: DefaultEtEventProcessor.java,v 1.5 2012/04/30 20:04:39 jeremy Exp $
  */
 public class DefaultEtEventProcessor implements EtEventProcessor
 {
@@ -36,7 +36,7 @@
     int status;
     boolean stopProcessing;
     boolean stopOnError;
-    Logger logger;
+    static Logger logger;
 
     /**
      * 
@@ -62,11 +62,13 @@
         this.maxEvents = maxEvents;
         this.stopOnError = stopOnError;
 
-        // Setup the logger.
-        logger = Logger.getLogger(this.getClass().getSimpleName());
-        logger.setUseParentHandlers(false);
-        logger.addHandler(logHandler);
-        logger.setLevel(Level.ALL);
+        // Setup the logger if needed.
+        if (logger == null) {
+            logger = Logger.getLogger(this.getClass().getSimpleName());
+            logger.setUseParentHandlers(false);
+            logger.addHandler(logHandler);
+            logger.setLevel(Level.ALL);
+        }   
         
         // Log an initialization message.
         logger.log(Level.INFO, "Event processor initialized successfully.");

hps-java/src/main/java/org/lcsim/hps/monitoring
MonitoringApplication.java 1.32 -> 1.33
diff -u -r1.32 -r1.33
--- MonitoringApplication.java	30 Apr 2012 13:36:56 -0000	1.32
+++ MonitoringApplication.java	30 Apr 2012 20:04:39 -0000	1.33
@@ -73,7 +73,7 @@
  * calling its main() method.
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: MonitoringApplication.java,v 1.32 2012/04/30 13:36:56 jeremy Exp $
+ * @version $Id: MonitoringApplication.java,v 1.33 2012/04/30 20:04:39 jeremy Exp $
  */
 public class MonitoringApplication {
 
@@ -120,7 +120,7 @@
     private MonitoringApplicationActionListener actionListener;
 
     // Logging objects.
-    private Logger logger;
+    private static Logger logger;
     private Handler logHandler;
     private DefaultTableModel logTableModel;
     private JTable logTable;
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1