Uniform log output in the default app.

rapidoid · Feb 2, 2017 · 6f07db0 · 6f07db0
1 parent ed05d9e
commit 6f07db0
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 122 deletions.
diff --git a/docker-tests/output/admin-service-foo.txt b/docker-tests/output/admin-service-foo.txt
@@ -15,7 +15,7 @@
 Exception in thread "main" java.lang.IllegalArgumentException: Unknown service: 'foo'!
 	at org.rapidoid.u.U.illegal(U.java:432)
 	at org.rapidoid.u.U.must(U.java:458)
-	at org.rapidoid.util.Msc.bootService(Msc.java:1050)
+	at org.rapidoid.util.Msc.bootService(Msc.java:1051)
 	at org.rapidoid.setup.ServiceActivator.boot(ServiceActivator.java:81)
 	at org.rapidoid.setup.ServiceActivator.bootstrapServices(ServiceActivator.java:57)
 	at org.rapidoid.setup.ServiceActivator.activateServices(ServiceActivator.java:43)
@@ -24,5 +24,5 @@ Exception in thread "main" java.lang.IllegalArgumentException: Unknown service:
 	at org.rapidoid.setup.AppBootstrap.services(AppBootstrap.java:136)
 	at org.rapidoid.setup.App.boot(App.java:98)
 	at org.rapidoid.setup.App.run(App.java:91)
-	at org.rapidoid.platform.Platform.start(Platform.java:60)
+	at org.rapidoid.platform.Platform.start(Platform.java:54)
 	at org.rapidoid.platform.Main.main(Main.java:44)
diff --git a/docker-tests/output/app-jar.txt b/docker-tests/output/app-jar.txt
diff --git a/docker-tests/output/app-service-foo.txt b/docker-tests/output/app-service-foo.txt
@@ -15,7 +15,7 @@
 Exception in thread "main" java.lang.IllegalArgumentException: Unknown service: 'foo'!
 	at org.rapidoid.u.U.illegal(U.java:432)
 	at org.rapidoid.u.U.must(U.java:458)
-	at org.rapidoid.util.Msc.bootService(Msc.java:1050)
+	at org.rapidoid.util.Msc.bootService(Msc.java:1051)
 	at org.rapidoid.setup.ServiceActivator.boot(ServiceActivator.java:81)
 	at org.rapidoid.setup.ServiceActivator.bootstrapServices(ServiceActivator.java:57)
 	at org.rapidoid.setup.ServiceActivator.activateServices(ServiceActivator.java:42)
@@ -24,5 +24,5 @@ Exception in thread "main" java.lang.IllegalArgumentException: Unknown service:
 	at org.rapidoid.setup.AppBootstrap.services(AppBootstrap.java:136)
 	at org.rapidoid.setup.App.boot(App.java:98)
 	at org.rapidoid.setup.App.run(App.java:91)
-	at org.rapidoid.platform.Platform.start(Platform.java:60)
+	at org.rapidoid.platform.Platform.start(Platform.java:54)
 	at org.rapidoid.platform.Main.main(Main.java:44)
diff --git a/docker-tests/output/configuration.txt b/docker-tests/output/configuration.txt
@@ -21,12 +21,12 @@
 [PLATFORM] INFO | ---------------------------------------------------
 [PLATFORM] INFO | ADMIN CREDENTIALS: username = admin, password = <?>
 [PLATFORM] INFO | ---------------------------------------------------
-[APP] INFO | 02/Feb/2017 09:39:39:734 | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid v<?>, built on <?> [Dockerized] [Uniform output]
-[APP] INFO | 02/Feb/2017 09:39:39:737 | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = <?> | process = <?> | max memory = <?> | dir = /opt
-[APP] INFO | 02/Feb/2017 09:39:39:766 | main | org.rapidoid.env.Env | Setting application root | root = /app | content = [/app/rapidoid.yml]
-[APP] INFO | 02/Feb/2017 09:39:39:982 | main | org.rapidoid.env.Environment | No profiles were specified, activating 'default' profile
-[APP] INFO | 02/Feb/2017 09:39:39:985 | main | org.rapidoid.env.Environment | No production/dev/test mode was configured, inferring mode | mode = PRODUCTION
-[APP] INFO | 02/Feb/2017 09:39:39:985 | main | org.rapidoid.env.Environment | Automatically activating mode-specific profile | profile = production
-[APP] INFO | 02/Feb/2017 09:39:39:985 | main | org.rapidoid.env.Environment | Initialized environment | mode = PRODUCTION | profiles = [default, production]
-[APP] INFO | 02/Feb/2017 09:39:40:112 | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
-[APP] INFO | 02/Feb/2017 09:39:40:114 | main | org.rapidoid.config.ConfigImpl | Loaded configuration | namespace = config | files = [built-in-config.yml, built-in-config-default.yml]
+[APP] INFO | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid v<?>, built on <?> [Dockerized] [Uniform output]
+[APP] INFO | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = <?> | process = <?> | max memory = <?> | dir = /opt
+[APP] INFO | org.rapidoid.env.Env | Setting application root | root = /app | content = [/app/rapidoid.yml]
+[APP] INFO | org.rapidoid.env.Environment | No profiles were specified, activating 'default' profile
+[APP] INFO | org.rapidoid.env.Environment | No production/dev/test mode was configured, inferring mode | mode = PRODUCTION
+[APP] INFO | org.rapidoid.env.Environment | Automatically activating mode-specific profile | profile = production
+[APP] INFO | org.rapidoid.env.Environment | Initialized environment | mode = PRODUCTION | profiles = [default, production]
+[APP] INFO | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
+[APP] INFO | org.rapidoid.config.ConfigImpl | Loaded configuration | namespace = config | files = [built-in-config.yml, built-in-config-default.yml]
diff --git a/docker-tests/output/env-config.txt b/docker-tests/output/env-config.txt
@@ -22,13 +22,13 @@
 [PLATFORM] INFO | ---------------------------------------------------
 [PLATFORM] INFO | ADMIN CREDENTIALS: username = admin, password = <?>
 [PLATFORM] INFO | ---------------------------------------------------
-[APP] INFO | 02/Feb/2017 09:39:43:183 | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid v<?>, built on <?> [Dockerized] [Uniform output]
-[APP] INFO | 02/Feb/2017 09:39:43:184 | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = <?> | process = <?> | max memory = <?> | dir = /opt
-[APP] INFO | 02/Feb/2017 09:39:43:208 | main | org.rapidoid.env.Env | Setting application root | root = /app | content = [/app/the-root, /app/my-config.yaml]
-[APP] INFO | 02/Feb/2017 09:39:43:215 | main | org.rapidoid.config.ConfigBase | Changing configuration filename base | from = config | to = my-config
-[APP] INFO | 02/Feb/2017 09:39:43:360 | main | org.rapidoid.env.Environment | No profiles were specified, activating 'default' profile
-[APP] INFO | 02/Feb/2017 09:39:43:364 | main | org.rapidoid.env.Environment | No production/dev/test mode was configured, inferring mode | mode = PRODUCTION
-[APP] INFO | 02/Feb/2017 09:39:43:364 | main | org.rapidoid.env.Environment | Automatically activating mode-specific profile | profile = production
-[APP] INFO | 02/Feb/2017 09:39:43:365 | main | org.rapidoid.env.Environment | Initialized environment | mode = PRODUCTION | profiles = [default, production]
-[APP] INFO | 02/Feb/2017 09:39:43:494 | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
-[APP] INFO | 02/Feb/2017 09:39:43:496 | main | org.rapidoid.config.ConfigImpl | Loaded configuration | namespace = my-config | files = [built-in-config.yml, built-in-config-default.yml, /app/my-config.yaml]
+[APP] INFO | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid v<?>, built on <?> [Dockerized] [Uniform output]
+[APP] INFO | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = <?> | process = <?> | max memory = <?> | dir = /opt
+[APP] INFO | org.rapidoid.env.Env | Setting application root | root = /app | content = [/app/the-root, /app/my-config.yaml]
+[APP] INFO | org.rapidoid.config.ConfigBase | Changing configuration filename base | from = config | to = my-config
+[APP] INFO | org.rapidoid.env.Environment | No profiles were specified, activating 'default' profile
+[APP] INFO | org.rapidoid.env.Environment | No production/dev/test mode was configured, inferring mode | mode = PRODUCTION
+[APP] INFO | org.rapidoid.env.Environment | Automatically activating mode-specific profile | profile = production
+[APP] INFO | org.rapidoid.env.Environment | Initialized environment | mode = PRODUCTION | profiles = [default, production]
+[APP] INFO | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
+[APP] INFO | org.rapidoid.config.ConfigImpl | Loaded configuration | namespace = my-config | files = [built-in-config.yml, built-in-config-default.yml, /app/my-config.yaml]
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java b/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java
@@ -4,7 +4,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.u.U;
-import org.rapidoid.util.GlobalCfg;
+import org.rapidoid.log.GlobalCfg;
 import org.rapidoid.util.Msc;
 
 import java.io.IOException;

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java b/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
@@ -24,6 +24,7 @@
 import org.rapidoid.io.IO;
 import org.rapidoid.io.Res;
 import org.rapidoid.lambda.*;
+import org.rapidoid.log.GlobalCfg;
 import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
 import org.rapidoid.validation.InvalidData;

diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
@@ -552,6 +552,7 @@ org.rapidoid.lambda.ToMap
 org.rapidoid.lambda.TwoParamLambda
 org.rapidoid.log.commons.RapidoidLog
 org.rapidoid.log.commons.RapidoidLogFactory
+org.rapidoid.log.GlobalCfg
 org.rapidoid.log.Log
 org.rapidoid.log.LogbackUtil
 org.rapidoid.log.LogHP
@@ -730,7 +731,6 @@ org.rapidoid.util.Deleted
 org.rapidoid.util.Dict
 org.rapidoid.util.ErrCodeAndMsg
 org.rapidoid.util.Expectation
-org.rapidoid.util.GlobalCfg
 org.rapidoid.util.LazyInit
 org.rapidoid.util.Lorem
 org.rapidoid.util.MapEntry

diff --git a/...ain/java/org/rapidoid/util/GlobalCfg.java → ...main/java/org/rapidoid/log/GlobalCfg.java b/...ain/java/org/rapidoid/util/GlobalCfg.java → ...main/java/org/rapidoid/log/GlobalCfg.java
@@ -1,12 +1,8 @@
-package org.rapidoid.util;
-
-import org.rapidoid.RapidoidThing;
-import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Since;
+package org.rapidoid.log;
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-essentials
  * %%
  * Copyright (C) 2014 - 2017 Nikolche Mihajlovski and contributors
  * %%
@@ -24,12 +20,17 @@
  * #L%
  */
 
-@Authors("Nikolche Mihajlovski")
-@Since("5.2.5")
+import org.rapidoid.RapidoidThing;
+
+/**
+ * @author Nikolche Mihajlovski
+ * @since 5.2.5
+ */
 public class GlobalCfg extends RapidoidThing {
 
-	private static final boolean uniformOutput = "true".equalsIgnoreCase(System.getenv("UNIFORM_OUTPUT"))
-		|| "true".equalsIgnoreCase(System.getenv("uniform_output"));
+	private static final boolean uniformOutput =
+		"true".equalsIgnoreCase(System.getenv("UNIFORM_OUTPUT"))
+			|| "true".equalsIgnoreCase(System.getenv("uniform_output"));
 
 	public static boolean uniformOutput() {
 		return uniformOutput;

diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java b/rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java
@@ -39,9 +39,9 @@ public class LogOptions extends RapidoidThing {
 
 	private volatile String prefix;
 
-	private volatile boolean showThread = true;
+	private volatile boolean showThread = !GlobalCfg.uniformOutput();
 
-	private volatile boolean showDateTime = true;
+	private volatile boolean showDateTime = !GlobalCfg.uniformOutput();
 
 	private volatile DateFormat dateTimeFormat = new SimpleDateFormat("dd/MMM/yyyy HH:mm:ss:SSS");
 

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/lowlevel/LowLevelHttpIO.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/impl/lowlevel/LowLevelHttpIO.java
@@ -24,7 +24,7 @@
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.GlobalCfg;
+import org.rapidoid.log.GlobalCfg;
 import org.rapidoid.util.Msc;
 import org.rapidoid.util.StreamUtils;
 

diff --git a/rapidoid-platform/src/main/java/org/rapidoid/platform/DefaultApp.java b/rapidoid-platform/src/main/java/org/rapidoid/platform/DefaultApp.java
@@ -29,11 +29,8 @@
 @Since("5.3.0")
 public class DefaultApp extends RapidoidThing {
 
-	private static final String[] EXTRA_ARGS = {
-	};
-
 	public static void main(String[] args) {
-		App.run(args, EXTRA_ARGS);
+		App.run(args);
 	}
 
 }
diff --git a/rapidoid-platform/src/main/java/org/rapidoid/platform/Platform.java b/rapidoid-platform/src/main/java/org/rapidoid/platform/Platform.java
@@ -32,7 +32,6 @@
 import org.rapidoid.setup.Setup;
 import org.rapidoid.u.U;
 import org.rapidoid.util.AppInfo;
-import org.rapidoid.util.GlobalCfg;
 import org.rapidoid.util.Msc;
 
 import java.awt.*;
@@ -51,11 +50,6 @@ static void start(String[] args, @SuppressWarnings("unused") boolean defaults) {
 		Log.options().prefix("[PLATFORM] ");
 		Log.options().inferCaller(false);
 
-		if (GlobalCfg.uniformOutput()) {
-			Log.options().showThread(false);
-			Log.options().showDateTime(false);
-		}
-
 		Msc.setPlatform(true);
 		App.run(args);