Merge pull request #10 from ndeloof/master

[FIXED JENKINS-18701] map legacy log levels (1:9) to java.util.logging.Level
jenkinsci · Jul 17, 2013 · 6bbe9e1 · 6bbe9e1
2 parents 38a8431 + b3ebfeb
commit 6bbe9e1
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/java/winstone/tools/WinstoneControl.java b/src/java/winstone/tools/WinstoneControl.java
@@ -38,7 +38,21 @@ public class WinstoneControl {
 
     public static OInt CONTROL_PORT = Option.integer("controlPort");
     public static OInt PORT = Option.integer("port");
-    public static OInt DEBUG = Option.integer("debug", Level.INFO.intValue());
+    public static OInt DEBUG = new OInt("debug", 5) {
+        public int get(Map args) {
+            switch(super.get(args)) {
+                // before switching to java.util.Logging, winstone used a (1:9) range for log levels
+                case 1: return Logger.MIN.intValue();
+                case 2: return Logger.ERROR.intValue();
+                case 3: return Logger.WARNING.intValue();
+                case 4: return Logger.INFO.intValue();
+                case 6: return Logger.SPEED.intValue();
+                case 7: return Logger.DEBUG.intValue();
+                case 8: return Logger.FULL_DEBUG.intValue();
+                case 9: return Logger.MAX.intValue();
+                case 5:
+                default: return Logger.INFO.intValue();
+    }}};
     public static OString HOST = Option.string("host", "localhost");