From ed74d934d396afeedbdab95b22ba0460fe55b041 Mon Sep 17 00:00:00 2001
From: yinxiu <yinxiu@mogujie.com>
Date: Mon, 11 Jan 2016 16:15:41 +0800
Subject: [PATCH] add setAlarmHandler for otter

---
 .../otter/canal/instance/core/AbstractCanalInstance.java    | 4 ++++
 .../canal/instance/manager/CanalInstanceWithManager.java    | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
index 9d0562b0..a3ae52eb 100644
--- a/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
+++ b/instance/core/src/main/java/com/alibaba/otter/canal/instance/core/AbstractCanalInstance.java
@@ -74,6 +74,10 @@ public class AbstractCanalInstance extends AbstractCanalLifeCycle implements Can
             metaManager.start();
         }
 
+        if (!alarmHandler.isStart()) {
+            alarmHandler.start();
+        }
+
         if (!eventStore.isStart()) {
             eventStore.start();
         }
diff --git a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
index 07bbff83..9005c73d 100644
--- a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
+++ b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
@@ -18,7 +18,6 @@ import com.alibaba.otter.canal.common.alarm.LogAlarmHandler;
 import com.alibaba.otter.canal.common.utils.JsonUtils;
 import com.alibaba.otter.canal.common.zookeeper.ZkClientx;
 import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter;
-import com.alibaba.otter.canal.instance.core.CanalInstance;
 import com.alibaba.otter.canal.instance.manager.model.Canal;
 import com.alibaba.otter.canal.instance.manager.model.CanalParameter;
 import com.alibaba.otter.canal.instance.manager.model.CanalParameter.DataSourcing;
@@ -47,7 +46,6 @@ import com.alibaba.otter.canal.parse.index.PeriodMixedLogPositionManager;
 import com.alibaba.otter.canal.parse.index.ZooKeeperLogPositionManager;
 import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
 import com.alibaba.otter.canal.protocol.CanalEntry.Entry;
-import com.alibaba.otter.canal.protocol.ClientIdentity;
 import com.alibaba.otter.canal.protocol.position.EntryPosition;
 import com.alibaba.otter.canal.sink.CanalEventSink;
 import com.alibaba.otter.canal.sink.entry.EntryEventSink;
@@ -420,4 +418,8 @@ public class CanalInstanceWithManager extends AbstractCanalInstance {
         return ZkClientx.getZkClient(StringUtils.join(zkClusters, ";"));
     }
 
+    public void setAlarmHandler(CanalAlarmHandler alarmHandler) {
+        this.alarmHandler = alarmHandler;
+    }
+
 }