Print

---

Author: [log in to unmask]
Date: Wed Oct  7 13:16:49 2015
New Revision: 3794

Log:
Setup default logging in EvioToLcio if Java logging props are not set.

Modified:
    java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java
    java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java

Modified: java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java	Wed Oct  7 13:16:49 2015
@@ -26,6 +26,7 @@
 import org.hps.conditions.database.DatabaseConditionsManager;
 import org.hps.detector.svt.SvtDetectorSetup;
 import org.hps.job.JobManager;
+import org.hps.logging.config.DefaultLoggingConfig;
 import org.hps.record.LCSimEventBuilder;
 import org.hps.record.evio.EvioEventQueue;
 import org.hps.record.evio.EvioEventUtilities;
@@ -89,7 +90,11 @@
      * @param args The command line arguments.
      */
     public static void main(final String[] args) {
-        final EvioToLcio evioToLcio = new EvioToLcio();
+
+        // Initialize default logging settings if no system props are set.
+        DefaultLoggingConfig.initialize();
+                
+        final EvioToLcio evioToLcio = new EvioToLcio();        
         evioToLcio.parse(args);
         evioToLcio.run();
     }

Modified: java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java
 =============================================================================
--- java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java	(original)
+++ java/trunk/logging/src/main/java/org/hps/logging/config/DefaultLoggingConfig.java	Wed Oct  7 13:16:49 2015
@@ -22,4 +22,15 @@
             throw new RuntimeException("Initialization of default logging configuration failed.", e);
         }
     }
+    
+    /**
+     * Initialize default logging if java system properties are not set.
+     */
+    public static void initialize() {
+        if (System.getProperty("java.util.logging.config.class") == null &&
+                System.getProperty("java.util.logging.config.file") == null) {
+            // Config is only read in if there is not an externally set class or file already.
+            new DefaultLoggingConfig();
+        }
+    }
 }