[Gzz-commits] storm/org/nongnu/storm/simulator StormSimulator...

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Hermanni Hyytiälä <address@hidden>      03/05/28 07:27:17

Modified files:
        org/nongnu/storm/simulator: StormSimulator.java 

Log message:
        logging levels

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/simulator/StormSimulator.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/simulator/StormSimulator.java
diff -u storm/org/nongnu/storm/simulator/StormSimulator.java:1.1 
storm/org/nongnu/storm/simulator/StormSimulator.java:1.2
--- storm/org/nongnu/storm/simulator/StormSimulator.java:1.1    Wed May 28 
05:56:33 2003
+++ storm/org/nongnu/storm/simulator/StormSimulator.java        Wed May 28 
07:27:17 2003
@@ -36,19 +36,61 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.BasicConfigurator; 
+import org.apache.log4j.lf5.LogLevelFormatException;
+
+/*
+ * A simulator for Storm 
+ */
  
 public class StormSimulator implements Runnable{
     
+    static private void p(String s) { System.out.println(s); }
+    
     private static final Logger LOG =
        Logger.getLogger(StormSimulator.class.getName());
     
     
-    public StormSimulator() {
+    public StormSimulator(String[] args) {
+       
+       if (new File("log4j.properties").isFile()) {
+           PropertyConfigurator.configure("log4j.properties");
+       } else {
+           BasicConfigurator.configure();
+           if(args != null) setLogLevel(args[0]);
+       }
        
        Thread thread = new Thread(this);
        thread.setPriority(Thread.NORM_PRIORITY);
        thread.start();    
     }
+           
+    private void setLogLevel(String level) {       
+       if (level == "ALL") {       
+           LOG.setLevel(Level.ALL);
+           LOG.info("Setting logging level to: ALL");
+       } else if (level == "DEBUG") {          
+           LOG.setLevel(Level.DEBUG);
+           LOG.info("Setting logging level to: DEBUG");
+       } else if (level == "ERROR") {
+           LOG.setLevel(Level.ERROR);
+           LOG.info("Setting logging level to: ERROR");
+       } else if (level == "FATAL") {
+           LOG.setLevel(Level.FATAL);
+           LOG.info("Setting logging level to: FATAL");
+       } else if (level == "INFO") {
+           LOG.setLevel(Level.INFO);
+           LOG.info("Setting logging level to: INFO");
+       } else if (level == "WARN") {
+           LOG.setLevel(Level.WARN);
+           LOG.info("Setting logging level to: WARN");
+       } else if (level == "OFF") {
+           LOG.setLevel(Level.OFF);
+           LOG.info("Setting logging level to: OFF");
+       } else {
+           LOG.setLevel(Level.DEBUG);
+           LOG.info("Setting default logging level to: DEBUG");                
                           
+       }       
+    }
     
     public void run(){
        
@@ -56,17 +98,16 @@
        
     }
     
-    public static void main(String[] args){
-       
-       if (new File("log4j.properties").isFile()) {
-           PropertyConfigurator.configure("log4j.properties");
+    public String getLogLevel() {
+       if (LOG.getLevel() != null) {   
+           return LOG.getLevel().toString();
        } else {
-           BasicConfigurator.configure();
-           LOG.setLevel(Level.DEBUG);
+           return "null";
        }
-
-       new StormSimulator();
     }
-
-
+    
+    public static void main(String[] args){    
+       new StormSimulator(args);
+       }
+    
 }