0001128: Add new parameter to make heartbeat at server startup option…

…al. Defaulting heartbeat at startup to off.
JumpMind · Mar 19, 2013 · a6554b5 · a6554b5
1 parent b1c83f3
commit a6554b5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -540,7 +540,9 @@ public synchronized boolean start(boolean startJobs) {
 
                             }
 
-                            heartbeat(false);
+                            if (parameterService.is(ParameterConstants.HEARTBEAT_SYNC_ON_STARTUP, false)) {
+                                heartbeat(false);
+                            }
 
                         } else {
                             log.info("Starting unregistered node [group={}, externalId={}]",

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
@@ -194,6 +194,7 @@ private ParameterConstants() {
 
     public final static String OFFLINE_NODE_DETECTION_PERIOD_MINUTES = "offline.node.detection.period.minutes";
     public final static String HEARTBEAT_SYNC_ON_PUSH_PERIOD_SEC = "heartbeat.sync.on.push.period.sec";
+    public final static String HEARTBEAT_SYNC_ON_STARTUP = "heartbeat.sync.on.startup";
 
     public final static String HEARTBEAT_ENABLED = "heartbeat.sync.on.push.enabled";
 

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -885,6 +885,12 @@ heartbeat.sync.on.push.enabled=true
 # Tags: other
 heartbeat.sync.on.push.period.sec=0
 
+# When this property is set to true the heartbeat process will run at server startup.  Prior to 3.4
+# the heartbeat always happened at startup.
+# DatabaseOverridable: true
+# Tags: other
+heartbeat.sync.on.startup=false
+
 # This is the number of minutes that a node has been offline before taking action
 # A value of -1 (or any negative value) disables the feature.
 # DatabaseOverridable: true