Repository: incubator-zeppelin Updated Branches: refs/heads/master 1020b7987 -> 21d43c25a
Zeppelin-113 keep websocket connections alive Browser keeps pinging server every 60 secs to keep the websocket connection alive. Author: Rajat Gupta <[email protected]> Closes #109 from guptarajat/master and squashes the following commits: 7627598 [Rajat Gupta] Merge remote branch 'orig/master' 987a967 [Rajat Gupta] ping pong to keep web socket alive Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/21d43c25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/21d43c25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/21d43c25 Branch: refs/heads/master Commit: 21d43c25a0aa26ee910cc3c95fe6246e8f864e48 Parents: 1020b79 Author: Rajat Gupta <[email protected]> Authored: Wed Jun 17 16:35:56 2015 +0200 Committer: Lee moon soo <[email protected]> Committed: Sat Jun 20 15:06:07 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/socket/Message.java | 1 + .../main/java/org/apache/zeppelin/socket/NotebookServer.java | 6 ++++++ zeppelin-web/app/scripts/controllers/main.js | 4 ++++ 3 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/21d43c25/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java index e4626bf..d78f202 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java @@ -90,6 +90,7 @@ public class Message { // @param notes serialized List<NoteInfo> object PARAGRAPH_REMOVE, + PING, ANGULAR_OBJECT_UPDATE, // [s-c] add/update angular object ANGULAR_OBJECT_REMOVE, // [s-c] add angular object del http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/21d43c25/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java ---------------------------------------------------------------------- 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 69d62d8..c8238b4 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 @@ -136,6 +136,9 @@ public class NotebookServer extends WebSocketServer implements case COMPLETION: completion(conn, notebook, messagereceived); break; + case PING: + pong(); + break; case ANGULAR_OBJECT_UPDATED: angularObjectUpdated(conn, notebook, messagereceived); break; @@ -584,6 +587,9 @@ public class NotebookServer extends WebSocketServer implements return new ParagraphJobListener(this, note); } + private void pong() { + } + private void sendAllAngularObjects(Note note, WebSocket conn) { List<InterpreterSetting> settings = note.getNoteReplLoader().getInterpreterSettings(); if (settings == null || settings.size() == 0) { http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/21d43c25/zeppelin-web/app/scripts/controllers/main.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/app/scripts/controllers/main.js b/zeppelin-web/app/scripts/controllers/main.js index 4948b49..2720cbd 100644 --- a/zeppelin-web/app/scripts/controllers/main.js +++ b/zeppelin-web/app/scripts/controllers/main.js @@ -45,6 +45,10 @@ angular.module('zeppelinWebApp') WebSocket.send(JSON.stringify($scope.WebSocketWaitingList[o])); } } + setInterval(function(){ + $rootScope.$emit('sendNewEvent', {op: 'PING'}) + } + ,60000); }); WebSocket.onmessage(function(event) {
