nmelone/DataLogger-Generic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Process to restart and check status of logger script

Browse Source
This commit is contained in:
Patrick McDonagh
2016-05-03 14:02:37 -05:00
parent 231039a67a
commit 4207eaf77d
7 changed files with 43 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/.tmp/public/js/ng/controller_config.js
View File

@@ -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();
});
};

31
www/.tmp/public/js/ng/factory_config.js
View File

@@ -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;
};

20
www/api/controllers/ConfigController.js
View File

@@ -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)});
});
}
};

14
www/assets/js/ng/controller_config.js
View File

@@ -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();
});
};

31
www/assets/js/ng/factory_config.js
View File

@@ -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;
};

2
www/config/routes.js
View File

@@ -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"
};

6
www/package.json
View File

@@ -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",