diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-01 11:41:04 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-01 11:41:04 -0400 |
| commit | f6268e263458da78e445116e74dedb624885a5af (patch) | |
| tree | cfaec8fa155fe6257501d9e19b6b0e08aca38951 /www/js | |
| parent | c79860e81e03239d44793f7420874919082bc693 (diff) | |
#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
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventServer.js | 22 |
1 files changed, 15 insertions, 7 deletions
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 () { |