Skip to content
This repository has been archived by the owner on Oct 6, 2020. It is now read-only.

Commit

Permalink
Fixed lots of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@tuwid
tuwid committed Aug 13, 2015
1 parent 0201365 commit 5f0f9aa
Show file tree
Hide file tree
Showing 5 changed files with 135 additions and 12 deletions.
16 changes: 16 additions & 0 deletions pooler/test1.js
View file
Original file line number Diff line number Diff line change
@@ -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);
26 changes: 17 additions & 9 deletions routes/services.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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');
Expand Down Expand Up @@ -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;
Expand All @@ -164,7 +171,7 @@ router.get('/:id/action/:action', m.hasServiceAccess, function(req, res){
res.json({success:1, new_status: new_status});
}
});

break;

default:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions start.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion views/services/data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<td>{{service.type}}</td>
<td class="text-right">
<div class="btn-group">
<a href="/services/{{service.id}}/events/{{record.id}}" type="button" class="btn btn-primary pull-right">
<a href="/services/{{service_id}}/events/{{record.id}}" type="button" class="btn btn-primary pull-right">
View Event
</a>
</div>
Expand Down
99 changes: 99 additions & 0 deletions views/services/event.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{% extends '../master_layout.html' %}
{% block content %}


<div id="content" class="">



<div class="row">

<div class="col-md-10 col-md-offset-1">

<!-- <div class="mt30 mb25">
{% include "../includes/notifications.html" %}
</div>
--> <!-- Input Fields -->
<div class="panel">
<div class="panel-heading">
<span class="panel-title">Event Details</span>
<div class="widget-menu mr10">
<div class="btn-group">
<a href="/users/settings/edit" class="btn btn-xs btn-default dropdown-toggle">
<span class="glyphicon glyphicon-edit fs11 mr5"></span>Edit</button>
</a>
</div>
</div>
</div>
<div class="panel-body">

<div class="col-md-6">
<form class="form-horizontal" role="form">
<div class="form-group">
<label class="col-lg-6 control-label">Event ID</label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{event_data._id}}</p>
</div>
</div>
</div>
<div class="form-group">
<label class="col-lg-6 control-label">Event Status</label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{event_data.status}}</p>
</div>
</div>
</div>
<div class="form-group">
<label class="col-lg-6 control-label">Node Source </label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{event_data.source}}</p>
</div>
</div>
</div>
</form>

<form class="form-horizontal" role="form">
<div class="form-group">
<label class="col-lg-6 control-label">Event Date</label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{event_data.createdAt}}</p>
</div>
</div>
</div>
</form>
</div>
<div class="col-md-6">
<form class="form-horizontal" role="form">
<div class="form-group">
<label class="col-lg-6 control-label">Event Message</label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{ event_data.message.listed }}</p>
</div>
</div>
</div>
<!-- <div class="form-group">
<label class="col-lg-6 control-label">Server</label>
<div class="col-lg-6">
<div class="bs-component">
<p class="form-control-static text-muted">{{record.server}}</p>
</div>
</div>
</div>
-->
</form>
</div>

</div>
</div>
</div>
</div>

</div>


{% endblock %}

0 comments on commit 5f0f9aa

Please sign in to comment.