diff --git a/www/.tmp/public/js/ng/controller_config.js b/www/.tmp/public/js/ng/controller_config.js index 12566bd..5762724 100644 --- a/www/.tmp/public/js/ng/controller_config.js +++ b/www/.tmp/public/js/ng/controller_config.js @@ -49,12 +49,7 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices) var checkLoggerStatus = config.getLoggerStatus(); checkLoggerStatus.then(function(data){ $scope.loggerLoading = false; - if (data.status == "OK"){ - $scope.loggerRunning = data.running; - $scope.error = false; - } else { - $scope.error = data.message; - } + $scope.loggerRunning = data.status; }); }; // $scope.checkLogger(); @@ -62,12 +57,7 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices) $scope.restartLogger = function(){ var restartLogger = config.restartLogger(); restartLogger.then(function(data){ - if (data.status == "OK"){ - $scope.error = false; - $scope.checkLogger(); - } else { - $scope.error = data.message; - } + $scope.checkLogger(); }); }; diff --git a/www/.tmp/public/js/ng/factory_config.js b/www/.tmp/public/js/ng/factory_config.js index a1abc40..fc45143 100644 --- a/www/.tmp/public/js/ng/factory_config.js +++ b/www/.tmp/public/js/ng/factory_config.js @@ -48,19 +48,11 @@ poconsole.factory('config',function($q, $http, $log){ var getLoggerStatus = function(){ var deferred = $q.defer(); - $http.get('/json/logger/status').success(function(data) { - if(data.status == "OK"){ - deferred.resolve({ - running:data.running, - status: data.status - }); - } else { - deferred.resolve({ - status:data.status, - message: data.message, - - }); - } + $http.get('/logger_status').success(function(data) { + deferred.resolve({ + pid:data.pid, + status: data.status + }); }); return deferred.promise; }; @@ -68,16 +60,9 @@ poconsole.factory('config',function($q, $http, $log){ var restartLogger = function(){ var deferred = $q.defer(); $http.get('/json/logger/restart').success(function(data) { - if(data.status == "OK"){ - deferred.resolve({ - status: data.status - }); - } else { - deferred.resolve({ - status:data.status, - message: data.message - }); - } + deferred.resolve({ + data: data + }); }); return deferred.promise; }; diff --git a/www/api/controllers/ConfigController.js b/www/api/controllers/ConfigController.js index 25e32a6..6623221 100644 --- a/www/api/controllers/ConfigController.js +++ b/www/api/controllers/ConfigController.js @@ -6,6 +6,22 @@ */ module.exports = { - -}; + restartLogger: function(req, res){ + var exec = require('child_process').exec; + exec('/etc/init.d/tagserver start', function(error, stdout, stderr){ + if (err) return res.serverError(err); + res.ok(); + }); + }, + + checkLoggerStatus: function(req, res){ + var fs = require('fs'); + var isRunning = require('is-running'); + fs.readFile('/root/tagserver.pid', function(err, data){ + if (err) return res.serverError(err); + res.ok({pid:data, status:isRunning(data)}); + }); + } + +}; diff --git a/www/assets/js/ng/controller_config.js b/www/assets/js/ng/controller_config.js index 12566bd..5762724 100644 --- a/www/assets/js/ng/controller_config.js +++ b/www/assets/js/ng/controller_config.js @@ -49,12 +49,7 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices) var checkLoggerStatus = config.getLoggerStatus(); checkLoggerStatus.then(function(data){ $scope.loggerLoading = false; - if (data.status == "OK"){ - $scope.loggerRunning = data.running; - $scope.error = false; - } else { - $scope.error = data.message; - } + $scope.loggerRunning = data.status; }); }; // $scope.checkLogger(); @@ -62,12 +57,7 @@ poconsole.controller('configCtrl', function($scope, Page, $log, config, devices) $scope.restartLogger = function(){ var restartLogger = config.restartLogger(); restartLogger.then(function(data){ - if (data.status == "OK"){ - $scope.error = false; - $scope.checkLogger(); - } else { - $scope.error = data.message; - } + $scope.checkLogger(); }); }; diff --git a/www/assets/js/ng/factory_config.js b/www/assets/js/ng/factory_config.js index a1abc40..fc45143 100644 --- a/www/assets/js/ng/factory_config.js +++ b/www/assets/js/ng/factory_config.js @@ -48,19 +48,11 @@ poconsole.factory('config',function($q, $http, $log){ var getLoggerStatus = function(){ var deferred = $q.defer(); - $http.get('/json/logger/status').success(function(data) { - if(data.status == "OK"){ - deferred.resolve({ - running:data.running, - status: data.status - }); - } else { - deferred.resolve({ - status:data.status, - message: data.message, - - }); - } + $http.get('/logger_status').success(function(data) { + deferred.resolve({ + pid:data.pid, + status: data.status + }); }); return deferred.promise; }; @@ -68,16 +60,9 @@ poconsole.factory('config',function($q, $http, $log){ var restartLogger = function(){ var deferred = $q.defer(); $http.get('/json/logger/restart').success(function(data) { - if(data.status == "OK"){ - deferred.resolve({ - status: data.status - }); - } else { - deferred.resolve({ - status:data.status, - message: data.message - }); - } + deferred.resolve({ + data: data + }); }); return deferred.promise; }; diff --git a/www/config/routes.js b/www/config/routes.js index 7f75d4d..838539a 100644 --- a/www/config/routes.js +++ b/www/config/routes.js @@ -49,4 +49,6 @@ module.exports.routes = { "/tag_val/clear/:id": "Tag_valController.clearSingleTagData", "/csv/all": "Tag_valController.csvAll", "/csv/:id/:start/:end": "Tag_valController.csvSingle", + "/restart_logger": "ConfigController.restartLogger", + "/logger_status": "ConfigController.checkLoggerStatus" }; diff --git a/www/package.json b/www/package.json index b65373f..362da9b 100644 --- a/www/package.json +++ b/www/package.json @@ -7,6 +7,7 @@ "dependencies": { "ejs": "2.3.4", "grunt": "0.4.5", + "grunt-bower": "*", "grunt-contrib-clean": "0.6.0", "grunt-contrib-coffee": "0.13.0", "grunt-contrib-concat": "0.5.1", @@ -17,15 +18,14 @@ "grunt-contrib-uglify": "0.7.0", "grunt-contrib-watch": "0.5.3", "grunt-sails-linker": "~0.10.1", - "grunt-bower": "*", "grunt-sync": "0.2.4", "include-all": "~0.1.6", + "is-running": "^2.0.0", + "n3-charts": "*", "rc": "1.0.1", "sails": "~0.12.3", "sails-disk": "~0.10.9", - "n3-charts": "*", "sails-mysql": "^0.12.1" - }, "scripts": { "debug": "node debug app.js",