added heartbeat job.

JumpMind · Sep 30, 2007 · ba2bd6f · ba2bd6f
1 parent 95b49d4
commit ba2bd6f
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 1 deletion.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricEngine.java b/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricEngine.java
@@ -115,6 +115,14 @@ private void startJobs() {
             applicationContext.getBean(Constants.PURGE_JOB_TIMER);
         }
 
+        if (Boolean.TRUE
+                .toString()
+                .equalsIgnoreCase(
+                        properties
+                                .getProperty(PropertiesConstants.START_HEARTBEAT_JOB))) {
+            applicationContext.getBean(Constants.HEARTBEAT_JOB_TIMER);
+        }
+
         if (Boolean.TRUE
                 .toString()
                 .equalsIgnoreCase(
@@ -169,7 +177,7 @@ public void purge() {
                     "Cannot actuate a purge if it is already scheduled.");
         }
     }
-    
+
     public void heartbeat() {
         bootstrapService.heartbeat();
     }

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/common/Constants.java b/symmetric/src/main/java/org/jumpmind/symmetric/common/Constants.java
@@ -48,6 +48,8 @@ public class Constants {
 
     public static final String PURGE_JOB_TIMER = "purgeJobTimer";
 
+    public static final String HEARTBEAT_JOB_TIMER = "heartbeatJobTimer";
+
     public static final String SYNC_TRIGGERS_JOB_TIMER = "syncTriggersJobTimer";
 
     public static final String DATA_EXTRACTOR = "dataExtractor";

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/common/PropertiesConstants.java b/symmetric/src/main/java/org/jumpmind/symmetric/common/PropertiesConstants.java
@@ -5,5 +5,6 @@ public class PropertiesConstants {
     public final static String START_PULL_JOB = "symmetric.runtime.start.pull.job";
     public final static String START_PUSH_JOB = "symmetric.runtime.start.push.job";
     public final static String START_PURGE_JOB = "symmetric.runtime.start.purge.job";
+    public final static String START_HEARTBEAT_JOB = "symmetric.runtime.start.heartbeat.job";
     public final static String START_SYNCTRIGGERS_JOB = "symmetric.runtime.start.synctriggers.job";
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/job/HeartbeatJob.java b/symmetric/src/main/java/org/jumpmind/symmetric/job/HeartbeatJob.java
@@ -0,0 +1,28 @@
+package org.jumpmind.symmetric.job;
+
+import java.util.TimerTask;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jumpmind.symmetric.service.IBootstrapService;
+
+public class HeartbeatJob extends TimerTask {
+
+    private static final Log logger = LogFactory.getLog(PushJob.class);
+
+    private IBootstrapService bootstrapService;
+
+    @Override
+    public void run() {
+        try {
+            bootstrapService.heartbeat();
+        } catch (Throwable ex) {
+            logger.error(ex, ex);
+        }
+    }
+
+    public void setBootstrapService(IBootstrapService bootstrapService) {
+        this.bootstrapService = bootstrapService;
+    }
+
+}
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/BootstrapService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/BootstrapService.java
@@ -191,6 +191,7 @@ public void register() {
     public void heartbeat() {
         Node node = nodeService.findIdentity();
         if (node != null) {
+            logger.info("Updating my node information and heartbeat time.");
             node.setHeartbeatTime(new Date());
             node.setDatabaseType(dbDialect.getName());
             node.setDatabaseVersion(dbDialect.getVersion());

diff --git a/symmetric/src/main/resources/symmetric-jobs.xml b/symmetric/src/main/resources/symmetric-jobs.xml
@@ -95,6 +95,23 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
                 </bean>
             </list>
         </property>
+    </bean>
+
+    <bean id="heartbeatJobTimer" class="org.springframework.scheduling.timer.TimerFactoryBean">
+        <property name="scheduledTimerTasks">
+            <list>
+                <bean class="org.springframework.scheduling.timer.ScheduledTimerTask">
+                    <property name="delay" value="900000" />
+                    <property name="period" value="900000" />
+                    <property name="timerTask">
+                        <bean class="org.jumpmind.symmetric.job.HeartbeatJob">
+                            <property name="bootstrapService" ref="bootstrapService" />
+                        </bean>
+                    </property>
+                </bean>
+            </list>
+        </property>
     </bean>     
+
 
 </beans>
diff --git a/symmetric/src/main/resources/symmetric-properties.xml b/symmetric/src/main/resources/symmetric-properties.xml
@@ -27,6 +27,7 @@
                 <prop key="symmetric.runtime.start.pull.job">true</prop>
                 <prop key="symmetric.runtime.start.push.job">true</prop>
                 <prop key="symmetric.runtime.start.purge.job">true</prop>
+                <prop key="symmetric.runtime.start.heartbeat.job">true</prop>
                 <prop key="symmetric.runtime.start.synctriggers.job">true</prop>
                 <prop key="symmetric.runtime.registration.url"></prop>
                 <prop key="symmetric.runtime.my.url">http://localhost:8080/sync</prop>

diff --git a/symmetric/src/test/resources/symmetric-mysql-engine-1-continuous.properties b/symmetric/src/test/resources/symmetric-mysql-engine-1-continuous.properties
@@ -9,5 +9,6 @@ symmetric.runtime.start.pull.job=false
 symmetric.runtime.start.push.job=false
 symmetric.runtime.start.purge.job=false
 symmetric.runtime.start.synctriggers.job=false
+symmetric.runtime.start.heartbeat.job=false
 symmetric.runtime.purge.retention.minutes=0
 symmetric.runtime.schema.version=1
diff --git a/symmetric/src/test/resources/symmetric-mysql-engine-1.properties b/symmetric/src/test/resources/symmetric-mysql-engine-1.properties
@@ -9,4 +9,5 @@ symmetric.runtime.start.pull.job=false
 symmetric.runtime.start.push.job=false
 symmetric.runtime.start.purge.job=false
 symmetric.runtime.start.synctriggers.job=false
+symmetric.runtime.start.heartbeat.job=false
 symmetric.runtime.purge.retention.minutes=0
diff --git a/symmetric/src/test/resources/symmetric-mysql-engine-2.properties b/symmetric/src/test/resources/symmetric-mysql-engine-2.properties
@@ -9,5 +9,6 @@ symmetric.runtime.my.url=internal://symmetric2
 symmetric.runtime.start.pull.job=false
 symmetric.runtime.start.push.job=false
 symmetric.runtime.start.purge.job=false
+symmetric.runtime.start.heartbeat.job=false
 symmetric.runtime.start.synctriggers.job=false
 symmetric.runtime.purge.retention.minutes=0
diff --git a/symmetric/src/test/resources/symmetric-oracle-engine-1.properties b/symmetric/src/test/resources/symmetric-oracle-engine-1.properties
@@ -10,6 +10,7 @@ symmetric.transport.type=internal
 symmetric.runtime.my.url=internal://symmetric
 symmetric.runtime.start.pull.job=false
 symmetric.runtime.start.push.job=false
+symmetric.runtime.start.heartbeat.job=false
 symmetric.runtime.start.purge.job=false
 symmetric.runtime.start.synctriggers.job=false
 symmetric.runtime.purge.retention.minutes=0