diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java index 6b2bfacb495..a993992ae73 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java @@ -252,5 +252,10 @@ public Map> getRegistry() { public void setRegistry(Map> registry) { this.registry = registry; + for (Map map : registry.values()) { + for (AngularObject ao : map.values()) { + ao.setListener(angularObjectListener); + } + } } } diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java index 73c14f14880..bb6de31c49e 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java @@ -46,7 +46,7 @@ * RemoteInterpreterEventPoller is counter part in ZeppelinServer */ public class RemoteInterpreterEventClient implements ResourcePoolConnector { - private final Logger logger = LoggerFactory.getLogger(RemoteInterpreterEvent.class); + private final Logger logger = LoggerFactory.getLogger(RemoteInterpreterEventClient.class); private final List eventQueue = new LinkedList<>(); private final List getAllResourceResponse = new LinkedList<>(); private final Map getResourceResponse = new HashMap<>(); @@ -415,6 +415,7 @@ public void onInterpreterOutputUpdateAll( } private void sendEvent(RemoteInterpreterEvent event) { + logger.debug("Send Event: " + event); synchronized (eventQueue) { eventQueue.add(event); eventQueue.notifyAll(); @@ -446,7 +447,7 @@ public void onAppOutputUpdate( appendOutput.put("appId", appId); appendOutput.put("type", type); appendOutput.put("data", output); - logger.info("onAppoutputUpdate = {}", output); + logger.debug("onAppoutputUpdate = {}", output); sendEvent(new RemoteInterpreterEvent( RemoteInterpreterEventType.OUTPUT_UPDATE, gson.toJson(appendOutput))); diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java index f46d31af6c2..c841c718612 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java @@ -124,6 +124,9 @@ public void run() { AngularObjectRegistry angularObjectRegistry = interpreterGroup.getAngularObjectRegistry(); try { + if (event.getType() != RemoteInterpreterEventType.NO_OP) { + logger.debug("Receive message from RemoteInterpreter Process: " + event.toString()); + } if (event.getType() == RemoteInterpreterEventType.NO_OP) { continue; } else if (event.getType() == RemoteInterpreterEventType.ANGULAR_OBJECT_ADD) { diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 87a6bcaa932..250ffa446f6 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -492,7 +492,7 @@ private void broadcast(String noteId, Message m) { if (socketLists == null || socketLists.size() == 0) { return; } - LOG.debug("SEND >> " + m.op); + LOG.debug("SEND >> " + m); for (NotebookSocket conn : socketLists) { try { conn.send(serializeMessage(m)); @@ -510,7 +510,7 @@ private void broadcastExcept(String noteId, Message m, NotebookSocket exclude) { if (socketLists == null || socketLists.size() == 0) { return; } - LOG.debug("SEND >> " + m.op); + LOG.debug("SEND >> " + m); for (NotebookSocket conn : socketLists) { if (exclude.equals(conn)) { continue;