support configure log level by profile; add log level admin to dynamically change log levels

greenlaw110 · greenlaw110 · commit dfa435a78e3d · 2017-02-03T19:00:05.000+11:00
diff --git a/src/main/java/act/app/App.java b/src/main/java/act/app/App.java
@@ -46,6 +46,7 @@
 import org.osgl.cache.CacheServiceProvider;
 import org.osgl.http.H;
 import org.osgl.http.HttpConfig;
+import org.osgl.logging.LogManager;
 import org.osgl.logging.Logger;
 import org.osgl.mvc.MvcConfig;
 import org.osgl.storage.IStorageService;
@@ -730,6 +731,7 @@ private void loadConfig() {
         logger.debug("loading app configuration: %s ...", appBase.getAbsolutePath());
         config = new AppConfLoader().load(conf);
         config.app(this);
+        configureLoggingLevels();
         registerSingleton(AppConfig.class, config);
         registerValueObjectCodec();
         if (config.i18nEnabled()) {
@@ -1054,6 +1056,33 @@ private void registerBuiltInRythmTransformers() {
         rythmView.registerFormatter(this, new JodaDateTimeFormatter());
     }
 
+    private void configureLoggingLevels() {
+        Map map = config().subSet("log.level");
+        map.putAll(config().subSet("act.log.level"));
+        for (Object o : map.entrySet()) {
+            Map.Entry<String, String> entry = $.cast(o);
+            String key = entry.getKey();
+            if (key.startsWith("log.level")) {
+                key = key.substring("log.level.".length());
+            } else {
+                key = key.substring("act.log.level.".length());
+            }
+            Logger.Level level = loggerLevelOf(entry.getValue());
+            E.invalidConfigurationIf(null == level, "Unknown log level: %s", entry.getValue());
+            Logger logger = LogManager.get(key);
+            logger.setLevel(level);
+        }
+    }
+
+    private Logger.Level loggerLevelOf(String s) {
+        Map<String, Logger.Level> map = new HashMap<>();
+        for (Logger.Level level : Logger.Level.values()) {
+            map.put(level.name().toUpperCase(), level);
+        }
+        map.put("WARNING", Logger.Level.WARN);
+        return map.get(s.toUpperCase());
+    }
+
     private void scanAppCodes() {
         classLoader().scan();
         //classLoader().scan();
diff --git a/src/main/java/act/util/LogAdmin.java b/src/main/java/act/util/LogAdmin.java
@@ -0,0 +1,66 @@
+package act.util;
+
+import act.cli.Command;
+import act.cli.Required;
+import org.osgl.logging.LogManager;
+import org.osgl.logging.Logger;
+import org.osgl.logging.Logger.Level;
+import org.osgl.util.S;
+
+public class LogAdmin {
+
+    @Command(name = "act.log.level.show", help = "Show log level")
+    public String showLogLevel(@Required("specify logger name") String name) {
+        Logger logger = LogManager.get(name);
+        if (logger.isTraceEnabled()) {
+            return "trace";
+        } else if (logger.isDebugEnabled()) {
+            return "debug";
+        } else if (logger.isInfoEnabled()) {
+            return "info";
+        } else if (logger.isWarnEnabled()) {
+            return "warn";
+        } else if (logger.isErrorEnabled()) {
+            return "error";
+        }
+        return "fatal";
+    }
+
+    @Command(
+            name = "act.log.level.update",
+            help = "Update logger level. Valid levels are:\n" +
+                    "5 - fatal\n\t" +
+                    "4 - error\n\t" +
+                    "3 - warn\n\t" +
+                    "2 - info\n\t" +
+                    "1 - debug\n\t" +
+                    "0 - trace"
+    )
+    public String setLogLevel(
+            @Required("specify logger name") String name,
+            @Required("specify log level")  int level
+    ) {
+        Level lvl = convert(level);
+        Logger logger = LogManager.get(name);
+        logger.setLevel(lvl);
+        return S.fmt("logger[%s] level set to %s", name, lvl.toString());
+    }
+
+    private Level convert(int level) {
+        switch (level) {
+            case 0:
+                return Level.TRACE;
+            case 1:
+                return Level.DEBUG;
+            case 2:
+                return Level.INFO;
+            case 3:
+                return Level.WARN;
+            case 4:
+                return Level.ERROR;
+            default:
+                return Level.FATAL;
+        }
+    }
+
+}
