From 4ccb2469deca42f7f95ab3b1164bb7e2c014d9c9 Mon Sep 17 00:00:00 2001 From: Damien Corneau Date: Fri, 3 Jul 2015 14:44:08 +0900 Subject: [PATCH 1/2] Fix ZEPPELIN-113 --- .../websocketEvents/websocketEvents.factory.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js index 2c0121090c6..72a2db64591 100644 --- a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js +++ b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js @@ -15,15 +15,18 @@ angular.module('zeppelinWebApp').factory('websocketEvents', function($rootScope, $websocket, baseUrlSrv) { var websocketCalls = {}; - + websocketCalls.ws = $websocket(baseUrlSrv.getWebsocketProtocol() + '://' + location.hostname + ':' + baseUrlSrv.getPort()); - + websocketCalls.ws.onOpen(function() { console.log('Websocket created'); $rootScope.$broadcast('setConnectedStatus', true); + setInterval(function(){ + websocketCalls.sendNewEvent({op: 'PING'}); + }, 60000); }); - - + + websocketCalls.sendNewEvent = function(data) { console.log('Send >> %o, %o', data.op, data); websocketCalls.ws.send(JSON.stringify(data)); From 9677c3003442d154438ba3b6f732719cc210dce9 Mon Sep 17 00:00:00 2001 From: Damien Corneau Date: Fri, 3 Jul 2015 14:47:48 +0900 Subject: [PATCH 2/2] Remove spaces --- .../src/components/websocketEvents/websocketEvents.factory.js | 1 - 1 file changed, 1 deletion(-) diff --git a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js index 72a2db64591..0757d0aaea3 100644 --- a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js +++ b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js @@ -26,7 +26,6 @@ angular.module('zeppelinWebApp').factory('websocketEvents', function($rootScope, }, 60000); }); - websocketCalls.sendNewEvent = function(data) { console.log('Send >> %o, %o', data.op, data); websocketCalls.ws.send(JSON.stringify(data));