safe read

yegor256 · Dec 24, 2024 · b143d39 · b143d39
1 parent ea889ec
commit b143d39
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/rultor/Env.java b/src/main/java/com/rultor/Env.java
@@ -66,7 +66,7 @@ private Env() {
     public static String read(final String name) {
         final String xml = System.getenv(Env.SETTINGS_XML);
         final String ret;
-        if (xml == null) {
+        if (xml == null || Manifests.exists(name) && !Manifests.read(name).startsWith("${")) {
             ret = Manifests.read(name);
         } else {
             final String res = "rultor-mf/MANIFEST.MF";

diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Rultor-TwitterTokenSecret: ${twitter.tsecret}
 Rultor-SentryDsn: ${sentry.dsn}
 Rultor-GpgPublic: ${gpg.public}
 Rultor-GpgSecret: ${gpg.secret}
+Rultor-Test: ${test}
diff --git a/src/test/java/com/rultor/EnvTest.java b/src/test/java/com/rultor/EnvTest.java
@@ -80,7 +80,7 @@ void readsFromSettingsXml() {
             String.join(
                 "",
                 "<settings><profiles><profile><properties>",
-                "<dynamo.key>hello</dynamo.key>",
+                "<test>hello</test>",
                 "</properties></profile></profiles></settings>"
             )
         );
@@ -91,7 +91,7 @@ void readsFromSettingsXml() {
         );
         MatcherAssert.assertThat(
             "takes the right value",
-            Env.read("Rultor-DynamoKey"),
+            Env.read("Rultor-Test"),
             Matchers.equalTo("hello")
         );
     }

diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -32,9 +32,10 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=com.jcabi.log.MulticolorLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=[%color{%p}] %c{1}: %m%n
 
-log4j.logger.com.rultor=INFO
-log4j.logger.com.jcabi.dynamo=INFO
-log4j.logger.com.jcabi.github=INFO
+log4j.logger.com.rultor=WARN
+log4j.logger.com.jcabi.dynamo=WARN
+log4j.logger.com.jcabi.github=WARN
+log4j.logger.com.jcabi.xml.StrictXML=ERROR
 log4j.logger.com.jcabi.http.wire.VerboseWire=WARN
-log4j.logger.com.jcabi.manifests=INFO
-log4j.logger.co.stateful.mock=DEBUG
+log4j.logger.com.jcabi.manifests=WARN
+log4j.logger.co.stateful.mock=WARN