diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2016-10-03 14:14:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 14:14:55 -0400 |
| commit | e69b00e63f06bcccafc713a46fc31847d598d419 (patch) | |
| tree | 94582a32a960488c2b3b0bc26577bc1c44e0d91a /www/js/EventServer.js | |
| parent | a1a8d2e24f638ffe5bcf7229fcc84271aa145282 (diff) | |
| parent | 8a8b1d9766735becc351643697ea9f495767ab6a (diff) | |
Merge pull request #340 from pliablepixels/shrinking-header
initial experiments
Former-commit-id: 5194ee61e6690f8ddbdbba3e9dd14a116c9bd929
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 04a3d72a..8ea63531 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; //-------------------------------------------------------------------------- @@ -62,6 +60,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"; @@ -94,7 +95,7 @@ angular.module('zmApp.controllers') ws = $websocket.$new({ url: loginData.eventServer, reconnect: true, - reconnectInterval: 5000, + reconnectInterval: 60000, lazy: true }); @@ -103,6 +104,24 @@ angular.module('zmApp.controllers') // Transmit auth information to server ws.$on('$open', openHandshake); + NVRDataModel.debug ("Setting up websocket error handler" ); + ws.$on('$error', function (e){ + + // 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(){ + 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 () { NVRDataModel.log("Websocket closed"); |