From c79860e81e03239d44793f7420874919082bc693 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 1 Oct 2016 09:06:41 -0400 Subject: #341 - event server connection error display Former-commit-id: 12e2bd9cf517d5bbd5455afa023f4a5687587661 --- www/js/EventServer.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 04a3d72a..8ac31e8d 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -62,6 +62,9 @@ angular.module('zmApp.controllers') // Called once at app start. Does a lazy definition of websockets open //-------------------------------------------------------------------------- function init() { + + + $rootScope.isAlarm = 0; $rootScope.alarmCount = "0"; @@ -103,6 +106,12 @@ angular.module('zmApp.controllers') // Transmit auth information to server ws.$on('$open', openHandshake); + console.log ("********** SETTING UP ERROR WS " ); + ws.$on('$error', function (e){ + console.log ("******** WS ERROR CALLED"); + NVRDataModel.displayBanner('error',['Event Server connection error']); + }); + ws.$on('$close', function () { NVRDataModel.log("Websocket closed"); -- cgit v1.2.3 From f6268e263458da78e445116e74dedb624885a5af Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 1 Oct 2016 11:41:04 -0400 Subject: #341 - customize timing of error display. Once in 30 seconds is sufficient as websocket will keep trying forever til you disable ES Former-commit-id: 78ee8861f88e37399f977a4a06311c0301224e76 --- www/js/EventServer.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 8ac31e8d..555f566d 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -10,16 +10,14 @@ //-------------------------------------------------------------------------- angular.module('zmApp.controllers') - .factory('EventServer', ['NVRDataModel', '$rootScope', '$websocket', '$ionicPopup', '$timeout', '$q', 'zm', '$ionicPlatform', '$cordovaMedia', '$translate', function (NVRDataModel, $rootScope, $websocket, $ionicPopup, $timeout, $q, zm, $ionicPlatform, $cordovaMedia, $translate) { - + var lastEventServerCheck = Date.now(); var ws; var localNotificationId = 0; - - + var firstError = true; //-------------------------------------------------------------------------- @@ -106,10 +104,20 @@ angular.module('zmApp.controllers') // Transmit auth information to server ws.$on('$open', openHandshake); - console.log ("********** SETTING UP ERROR WS " ); + NVRDataModel.debug ("Setting up websocket error handler" ); ws.$on('$error', function (e){ - console.log ("******** WS ERROR CALLED"); - NVRDataModel.displayBanner('error',['Event Server connection error']); + + if ((Date.now() - lastEventServerCheck > 30000.0) || firstError) + { + NVRDataModel.debug ("Websocket Errorhandler called"); + $timeout( function(){ + NVRDataModel.displayBanner('error',['Event Server connection error']); + },3000); // leave 3 seconds for transitions + firstError = false; + lastEventServerCheck = Date.now(); + } + //console.log ("VALUE TIME " + lastEventServerCheck); + //console.log ("NOW TIME " + Date.now()); }); ws.$on('$close', function () { -- cgit v1.2.3 From 8e0730aabe1dd728f531f63114ae556023a6616f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 2 Oct 2016 17:53:37 -0400 Subject: #201 - initial framework - still buggy Former-commit-id: 06b81da17f62a04219cba920d3997c3040e76d94 --- www/js/EventServer.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 555f566d..8ea63531 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -95,7 +95,7 @@ angular.module('zmApp.controllers') ws = $websocket.$new({ url: loginData.eventServer, reconnect: true, - reconnectInterval: 5000, + reconnectInterval: 60000, lazy: true }); @@ -107,7 +107,9 @@ angular.module('zmApp.controllers') NVRDataModel.debug ("Setting up websocket error handler" ); ws.$on('$error', function (e){ - if ((Date.now() - lastEventServerCheck > 30000.0) || firstError) + // we don't need this check as I changed reconnect interval to 60s + //if ((Date.now() - lastEventServerCheck > 30000.0) || firstError) + if (1) { NVRDataModel.debug ("Websocket Errorhandler called"); $timeout( function(){ -- cgit v1.2.3