0003565: Add a new staging.dir parameter that controls the location of

the staging area.
JumpMind · May 16, 2018 · 24eb92e · 24eb92e
1 parent 32bee36
commit 24eb92e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
@@ -20,6 +20,7 @@
  */
 package org.jumpmind.symmetric;
 
+import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.File;
@@ -381,20 +382,22 @@ protected IJobManager createJobManager() {
 
     @Override
     protected IStagingManager createStagingManager() {
-        String directory = parameterService.getTempDirectory();
+        String directory = parameterService.getString(ParameterConstants.STAGING_DIR);
+        if (isBlank(directory)) {
+            directory = parameterService.getTempDirectory();
+        }
         String stagingManagerClassName = parameterService.getString(ParameterConstants.STAGING_MANAGER_CLASS);
         if (stagingManagerClassName != null) {
-        	try {
-        		Constructor<?> cons = Class.forName(stagingManagerClassName).getConstructor(ISymmetricEngine.class, String.class);
-        		return (IStagingManager) cons.newInstance(this, directory);
-        	} catch (Exception e) {
-        		throw new RuntimeException(e);
-        	}
+            try {
+                Constructor<?> cons = Class.forName(stagingManagerClassName).getConstructor(ISymmetricEngine.class, String.class);
+                return (IStagingManager) cons.newInstance(this, directory);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
 
         return new BatchStagingManager(this, directory);
     }
-
 
     @Override
     protected IStatisticManager createStatisticManager() {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -423,6 +423,8 @@ private ParameterConstants() {
     public final static String UPDATE_SERVICE_CLASS = "update.service.class";
 
     public final static String STAGING_MANAGER_CLASS = "staging.manager.class";
+
+    public final static String STAGING_DIR = "staging.dir";
 
     public final static String STATISTIC_MANAGER_CLASS = "statistic.manager.class";
 

diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
@@ -139,14 +139,14 @@ public String getString(String key) {
     }
 
     public String getTempDirectory() {
-    	String engineName = this.getEngineName();
-    	String tmpDirBase = getString("java.io.tmpdir", System.getProperty("java.io.tmpdir"));
+        String engineName = this.getEngineName();
+        String tmpDirBase = getString("java.io.tmpdir", System.getProperty("java.io.tmpdir"));
 
-    	if (StringUtils.trimToNull(engineName) == null) {
-    		return tmpDirBase;
-    	} else {
-    		return tmpDirBase+File.separator+engineName;
-    	}
+        if (StringUtils.trimToNull(engineName) == null) {
+            return tmpDirBase;
+        } else {
+            return tmpDirBase + File.separator + engineName;
+        }
     }
 
     protected abstract TypedProperties rereadApplicationParameters();

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -2222,3 +2222,10 @@ treat.binary.as.lob.enabled=true
 # Type: boolean
 # Tags: other
 right.trim.char.values=false
+
+
+# This is the location the staging directory will be put.   If it isn't set the staging directory will be located according to java.io.tmpdir.
+#
+# DatabaseOverridable: false
+# Tags: init
+staging.dir=