Merge pull request #27 from karenhanson/print-env-vars

Add printout of variables on app run
eclipse-pass · Oct 19, 2018 · 3f7073e · 3f7073e
2 parents 63bbf97 + 3338803
commit 3f7073e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/...arvest-cli/src/main/java/org/dataconservancy/pass/loader/nihms/cli/NihmsHarvesterApp.java b/...arvest-cli/src/main/java/org/dataconservancy/pass/loader/nihms/cli/NihmsHarvesterApp.java
@@ -85,6 +85,21 @@ public void run() {
                     + "To use a config file, create a file named \"{}\" in the app's folder or provide a valid path "
                     + "using the \"{}\" environment variable.", configFile.getAbsolutePath(), DEFAULT_CONFIG_FILENAME, NIHMS_CONFIG_FILEPATH_PROPKEY);
         }
+
+        if (LOG.isDebugEnabled()) {
+            StringBuilder props = new StringBuilder("\n"
+                        + "--------------------------------------------------------------\n"
+                        + "*                         PROPERTIES                         *\n"
+                        + "--------------------------------------------------------------\n");
+
+            props.append(NIHMS_CONFIG_FILEPATH_PROPKEY + ": " + configFile.toString());
+
+            for (String key : SYSTEM_PROPERTIES) {
+                props.append(key + ": " + ConfigUtil.getSystemProperty(key, "{uses_default}"));
+            }
+            props.append("--------------------------------------------------------------\n");
+            LOG.debug(props.toString());
+        }
 
         NihmsHarvester harvester = new NihmsHarvester();
         harvester.harvest(statusesToProcess, startDate);        

diff --git a/...ad-cli/src/main/java/org/dataconservancy/pass/loader/nihms/cli/NihmsTransformLoadApp.java b/...ad-cli/src/main/java/org/dataconservancy/pass/loader/nihms/cli/NihmsTransformLoadApp.java
@@ -46,8 +46,9 @@ public class NihmsTransformLoadApp {
      */
     private static final String[] SYSTEM_PROPERTIES = {"pass.fedora.user", "pass.fedora.password", 
                                                        "pass.fedora.baseurl", "pass.elasticsearch.url",
-                                                       "pass.elasticsearch.limit","nihmsetl.repository.uri",
-                                                       "nihmsetl.pmcurl.template", "nihmsetl.loader.cachepath"};
+                                                       "pass.elasticsearch.limit", "nihmsetl.data.dir",
+                                                       "nihmsetl.repository.uri", "nihmsetl.pmcurl.template", 
+                                                       "nihmsetl.loader.cachepath"};
 
     private Set<NihmsStatus> statusesToProcess;
 
@@ -80,6 +81,21 @@ public void run() {
                     + "using the \"nihms.config.filepath\" environment variable.", configFile.getAbsolutePath(), DEFAULT_CONFIG_FILENAME);
         }
 
+        if (LOG.isDebugEnabled()) {
+            StringBuilder props = new StringBuilder("\n"
+                        + "--------------------------------------------------------------\n"
+                        + "*                         PROPERTIES                         *\n"
+                        + "--------------------------------------------------------------\n");
+
+            props.append(NIHMS_CONFIG_FILEPATH_PROPKEY + ": " + configFile.toString());
+
+            for (String key : SYSTEM_PROPERTIES) {
+                props.append(key + ": " + ConfigUtil.getSystemProperty(key, "{uses_default}"));
+            }
+            props.append("--------------------------------------------------------------\n");
+            LOG.debug(props.toString());
+        }
+
         NihmsTransformLoadService service = new NihmsTransformLoadService();
         service.transformAndLoadFiles(statusesToProcess);