Uniform version output for the Docker tests.

rapidoid · Sep 16, 2016 · 4c1d3e5 · 4c1d3e5
1 parent 9d667fd
commit 4c1d3e5
Show file tree

Hide file tree

Showing 35 changed files with 38 additions and 66 deletions.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java b/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java
@@ -48,7 +48,7 @@ public static synchronized void initialize() {
 			String dir = System.getProperty("user.dir");
 			String maxMem = (Runtime.getRuntime().maxMemory() / 1024 / 1024) + " MB";
 
-			Log.info("!Starting Rapidoid" + RapidoidInfo.notes() + "...", "!version", ver);
+			Log.info("!Starting Rapidoid" + RapidoidInfo.notes() + "...", "!version", Msc.maybeMasked(ver));
 
 			Log.info("!System info", "os", Msc.OS_NAME, "java", Msc.javaVersion(),
 				"process", Msc.maybeMasked(proc), "max memory", Msc.maybeMasked(maxMem), "dir", dir);

diff --git a/tests/output/admin-service-application.txt b/tests/output/admin-service-application.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/routes | roles = [administrator] | tx = NONE | mvc = true
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/beans | roles = [administrator] | tx = NONE | mvc = true

diff --git a/tests/output/admin-service-auth.txt b/tests/output/admin-service-auth.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = POST | path = /_login | roles = [] | tx = NONE | mvc = false
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET | path = /_logout | roles = [logged_in] | tx = NONE | mvc = false
diff --git a/tests/output/admin-service-center.txt b/tests/output/admin-service-center.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -13,7 +13,6 @@ INFO | main | org.rapidoid.util.Msc | --------------------------
 INFO | main | org.rapidoid.util.Msc | Registering Admin goodies:
 INFO | main | org.rapidoid.util.Msc | --------------------------
 INFO | main | org.rapidoid.insight.Metrics | Bootstraping metrics
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_ | roles = [administrator] | tx = NONE | mvc = true
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/entities | roles = [administrator] | tx = NONE | mvc = true

diff --git a/tests/output/admin-service-deploy.txt b/tests/output/admin-service-deploy.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/deploy | roles = [administrator] | tx = NONE | mvc = true
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = POST | path = /_/jar | roles = [administrator] | tx = NONE | mvc = false
diff --git a/tests/output/admin-service-entities.txt b/tests/output/admin-service-entities.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,6 +9,5 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/entities | roles = [administrator] | tx = NONE | mvc = true
diff --git a/tests/output/admin-service-foo.txt b/tests/output/admin-service-foo.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []

diff --git a/tests/output/admin-service-jmx.txt b/tests/output/admin-service-jmx.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/jmx/memory | roles = [administrator] | tx = NONE | mvc = true
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/jmx/mempool | roles = [administrator] | tx = NONE | mvc = true

diff --git a/tests/output/admin-service-lifecycle.txt b/tests/output/admin-service-lifecycle.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,6 +9,5 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/terminate | roles = [administrator] | tx = NONE | mvc = true
diff --git a/tests/output/admin-service-metrics.txt b/tests/output/admin-service-metrics.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_/metrics | roles = [administrator] | tx = NONE | mvc = true
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET | path = /_/graphs/{id:.*} | roles = [administrator] | tx = NONE | mvc = false
diff --git a/tests/output/admin-service-oauth.txt b/tests/output/admin-service-oauth.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,7 +9,6 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET | path = /_googleLogin | roles = [administrator] | tx = NONE | mvc = false
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET | path = /_googleOauthCallback | roles = [administrator] | tx = NONE | mvc = false

diff --git a/tests/output/admin-service-overview.txt b/tests/output/admin-service-overview.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,6 +9,5 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET,POST | path = /_ | roles = [administrator] | tx = NONE | mvc = true
diff --git a/tests/output/admin-service-ping.txt b/tests/output/admin-service-ping.txt
@@ -1,4 +1,4 @@
-INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = 5.2.3-SNAPSHOT
+INFO | main | org.rapidoid.config.RapidoidInitializer | Starting Rapidoid [Dockerized] [Uniform output]... | version = <?>
 INFO | main | org.rapidoid.config.RapidoidInitializer | System info | os = Linux | java = 1.8.0_91 | process = <?> | max memory = <?> | dir = /opt
 INFO | main | org.rapidoid.scan.ClasspathUtil | Scanning classpath | annotated = [@Controller, @Service, @Run, @Named, @Singleton] | packages = [null]
 INFO | main | org.rapidoid.scan.ClasspathUtil | Finished classpath scan | time = <?>ms | searched = 0 | found = []
@@ -9,6 +9,5 @@ INFO | main | org.rapidoid.commons.Environment | Initialized environment | mode
 INFO | main | org.rapidoid.scan.ClasspathUtil | Setting application JAR | appJar = /app/app.jar | exists = false
 INFO | main | org.rapidoid.io.Res | Setting application root | root = /app | content = []
 INFO | main | org.rapidoid.config.ConfigImpl | Loaded configuration | files = [default-config.yml, default-config-default.yml]
-INFO | main | org.rapidoid.setup.App | Inferring application root | main = null | package = org.rapidoid.setup
 INFO | server | org.rapidoid.net.impl.RapidoidServerLoop | Starting server | address = 0.0.0.0 | port = 8888 | I/O workers = 4 | sync = true | accept = non-blocking
 INFO | main | org.rapidoid.http.impl.HttpRoutesImpl | Registering handler | setup = admin | verbs = GET | path = /_ping | roles = [administrator] | tx = NONE | mvc = false