Merge pull request #34 from msmith-techempower/envvar-config

Support both System.properties and envvars
TechEmpower · Jan 30, 2019 · dcbc4c7 · dcbc4c7
2 parents bce3da1 + 5f6f887
commit dcbc4c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/gemini/src/main/java/com/techempower/gemini/Configurator.java b/gemini/src/main/java/com/techempower/gemini/Configurator.java
@@ -288,6 +288,12 @@ protected EnhancedProperties constructProperties()
     // Create a new properties object for each provider to use.
     final EnhancedProperties props = new EnhancedProperties(application);
 
+    // Add system properties passed
+    for (Map.Entry<Object, Object> entry : System.getProperties().entrySet())
+    {
+      props.put(entry.getKey().toString(), entry.getValue().toString());
+    }
+
     // Add system environment variables with the "Environment." prefix.
     for (Map.Entry<String, String> entry : System.getenv().entrySet())
     {

diff --git a/gemini/src/main/java/com/techempower/gemini/configuration/FileConfigurationProvider.java b/gemini/src/main/java/com/techempower/gemini/configuration/FileConfigurationProvider.java
@@ -319,6 +319,12 @@ else if (System.getProperty(GeminiConstants.CONFIGURATION_FILE) != null)
       filenames = System.getProperty(GeminiConstants.CONFIGURATION_FILE);
       log.log("Using specified configuration file(s): " + filenames);
     }
+    else if (System.getenv(GeminiConstants.CONFIGURATION_FILE) != null)
+    {
+      // Use configuration file names specified in an environment variable
+      filenames = System.getenv(GeminiConstants.CONFIGURATION_FILE);
+      log.log("Using specified configuration file(s): " + filenames);
+    }
     else
     {
       // Attempt to load a machine-specific configuration file.