0002991: Routing still runs with start.route.job=false

JumpMind · Mar 21, 2017 · 8012bcf · 8012bcf
1 parent d3caad0
commit 8012bcf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
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
@@ -66,7 +66,9 @@ private ParameterConstants() {
     public final static String START_REFRESH_CACHE_JOB = "start.refresh.cache.job";
     public final static String START_FILE_SYNC_TRACKER_JOB = "start.file.sync.tracker.job";
     public final static String START_FILE_SYNC_PUSH_JOB = "start.file.sync.push.job";
-    public final static String START_FILE_SYNC_PULL_JOB = "start.file.sync.pull.job";    
+    public final static String START_FILE_SYNC_PULL_JOB = "start.file.sync.pull.job";   
+
+    public final static String ROUTE_ON_EXTRACT = "route.on.extract";
 
     public final static String PULL_THREAD_COUNT_PER_SERVER = "pull.thread.per.server.count";
     public final static String PULL_MINIMUM_PERIOD_MS = "pull.period.minimum.ms";

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -479,7 +479,7 @@ public List<OutgoingBatch> extract(ProcessInfo processInfo, Node targetNode, Str
          * make sure that data is routed before extracting if the route job is
          * not configured to start automatically
          */
-        if (!parameterService.is(ParameterConstants.START_ROUTE_JOB)) {
+        if (!parameterService.is(ParameterConstants.START_ROUTE_JOB) && parameterService.is(ParameterConstants.ROUTE_ON_EXTRACT)) {
             routerService.routeData(true);
         }
 

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -891,6 +891,12 @@ start.initial.load.extract.job=true
 # Type: boolean
 start.monitor.job=true
 
+# Whether the routing job will start manually when a push or pull is started
+#
+# Tags: jobs
+# Type: boolean
+route.on.extract=false
+
 # The number of threads created that will be used to pull nodes concurrently on one server in the cluster.
 #
 # DatabaseOverridable: true