commit cbe0555d00736752e4a7c8a650d22d450baad5da
author Fangjin Yang <fangjin@metamarketsgroup.com> Fri Mar 01 19:25:25 2013 -0800
committer Fangjin Yang <fangjin@metamarketsgroup.com> Fri Mar 01 19:25:25 2013 -0800
tree 2819397aecbc309b4d07c8232c2ceed63cebe479
parent 49e61d00fde5c092adfa11e50aeaf66404d2e053

better logging

merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java

diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
index 9c36eec..8c56618 100644
--- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
+++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
@@ -408,9 +408,12 @@
             public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception
             {
               try {
+                if (event.getData() != null) {
+                  log.info("Event[%s]: %s", event.getType(), event.getData().getPath());
+                }
+
                 if (event.getType().equals(PathChildrenCacheEvent.Type.CHILD_ADDED) ||
                     event.getType().equals(PathChildrenCacheEvent.Type.CHILD_UPDATED)) {
-                  log.info("Event[%s]: %s", event.getType(), event.getData().getPath());
 
                   final String taskId = ZKPaths.getNodeFromPath(event.getData().getPath());
                   final TaskStatus taskStatus;
@@ -471,8 +474,8 @@
                     cleanup(worker.getHost(), taskId);
                     runPendingTasks();
                   }
-                } else if (event.getType().equals(PathChildrenCacheEvent.Type.CHILD_REMOVED)) {
-                  log.info("Event[%s]: %s", event.getType(), event.getData().getPath());
+                } else if (event.getType().equals(PathChildrenCacheEvent.Type.CHILD_REMOVED)
+                           || event.getType().equals(PathChildrenCacheEvent.Type.CONNECTION_LOST)) {
                   final String taskId = ZKPaths.getNodeFromPath(event.getData().getPath());
                   if (runningTasks.containsKey(taskId)) {
                     log.info("Task %s just disappeared!", taskId);