diff --git a/pooler/test1.js b/pooler/test1.js new file mode 100644 index 0000000..7fc491f --- /dev/null +++ b/pooler/test1.js @@ -0,0 +1,16 @@ + + +var data = { +'_id': '55ca2cfa4466d13442dc84ef', +'createdAt': 'Tue Aug 11 2015 19:12:26 GMT+0200 (CEST)', +'updatedAt': 'Tue Aug 11 2015 19:12:26 GMT+0200 (CEST)', +'message': { + 'listed': [ { status: 1, server: 'server1'}, { status: 1, server: 'server2'}, { status: 1, server: 'server3'}, { status: 1, server: 'server4'} ] + }, +'status': 'ERROR', +'source': '::ffff:127.0.0.1', +'__v': 0 +} + + +console.log(data.message); \ No newline at end of file diff --git a/routes/services.js b/routes/services.js index 10c7278..58d1a75 100644 --- a/routes/services.js +++ b/routes/services.js @@ -10,6 +10,7 @@ var m = require('../middlewares/middlewares.js'); var util = require('util'); var logger = require('../modules/logger.js'); var mongoose = require('mongoose'); +var workEmmiter = require('../modules/emmiter.js'); router.get('/index', function(req, res){ var user = req.user; @@ -33,8 +34,14 @@ router.get('/:id/events/:event_id', function(req, res){ serviceData.findOne({_id: req.params.event_id}, function(err, data) { if(!err) { - res.end(JSON.stringify(data)); - //res.render('services/data', {data : data}); + var event_data = data; + console.log(typeof data.message); + console.log(event_data); + console.log(event_data['status']); + console.log(event_data.status); + console.log(event_data['message']); + console.log(event_data.message); + res.render('services/event', {event_data : event_data}); } else { logger.debug(err); res.flash('error_messages', 'No data for this service'); @@ -140,13 +147,13 @@ router.get('/:id/action/:action', m.hasServiceAccess, function(req, res){ var new_status = service.running_status ? false : true; service.running_status = new_status; - + workEmmiter(service,'service_updates'); service.save(function(err) { - if(err) { - res.json({success:0}); - } else { - res.json({success:1, new_status: new_status}); - } + if(err) { + res.json({success:0}); + } else { + res.json({success:1, new_status: new_status}); + } }); break; @@ -164,7 +171,7 @@ router.get('/:id/action/:action', m.hasServiceAccess, function(req, res){ res.json({success:1, new_status: new_status}); } }); - + break; default: @@ -185,6 +192,7 @@ router.get('/:id/data', function service_data(req, res) { if(!err && data) { res.render('services/data', { data: data, + service_id : service_id, pageCount: pageCount, itemCount: itemCount, currentPage: req.query.page diff --git a/start.sh b/start.sh index 182946e..b5c776d 100755 --- a/start.sh +++ b/start.sh @@ -3,8 +3,8 @@ sudo service rabbitmq-server start sudo service redis-server start pm2 stop all pm2 start bin/www -pm2 start pooler/main.js -pm2 start pooler/workEmmiter.js +pm2 start pooler/workProcessor.js +pm2 start pooler/workEmmit.js pm2 status sleep 5 pm2 logs diff --git a/views/services/data.html b/views/services/data.html index 107ae69..87cdda7 100644 --- a/views/services/data.html +++ b/views/services/data.html @@ -47,7 +47,7 @@ {{service.type}}
- + View Event
diff --git a/views/services/event.html b/views/services/event.html new file mode 100644 index 0000000..23b3c7c --- /dev/null +++ b/views/services/event.html @@ -0,0 +1,99 @@ +{% extends '../master_layout.html' %} +{% block content %} + + +
+ + + +
+ +
+ + +
+
+ Event Details +
+
+ + Edit + +
+
+
+
+ +
+
+
+ +
+
+

{{event_data._id}}

+
+
+
+
+ +
+
+

{{event_data.status}}

+
+
+
+
+ +
+
+

{{event_data.source}}

+
+
+
+
+ +
+
+ +
+
+

{{event_data.createdAt}}

+
+
+
+
+
+
+
+
+ +
+
+

{{ event_data.message.listed }}

+
+
+
+ +
+
+ +
+
+
+
+ +
+ + +{% endblock %} \ No newline at end of file