Skip to content

Commit d7e18a7

Browse files
author
sweemeng
committed
cleanup and adding feature
1 parent 471b499 commit d7e18a7

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

app.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44
*/
55

66
var express = require('express'),
7-
app = express.createServer(),
7+
app = express.createServer(),
88
io = require('socket.io').listen(app),
9-
ejs = require('ejs');
10-
9+
ejs = require('ejs'),
10+
os = require('os');
1111

12+
var prev = 0
13+
var curr = 0
1214
// Configuration
1315

1416
app.configure(function(){
1517
app.register('.html',require('ejs'));
1618
app.set('views', __dirname + '/views');
1719
app.set('view engine', 'html');
1820
app.use(app.router);
21+
app.use(express.bodyParser());
1922
app.use(express.static(__dirname + '/public'));
2023
});
2124

@@ -26,7 +29,7 @@ io.configure(function() {
2629
io.of('/data').on('connection',function(socket){
2730
socket.emit('hello',{ data: 'hello'});
2831
socket.on('received',function(data){
29-
var value = Math.random() * 11;
32+
var value = os.loadavg()[0];
3033
socket.emit('send',{ data: value});
3134

3235
});
@@ -40,5 +43,6 @@ app.get('/', function(req, res){
4043
});
4144
});
4245

46+
4347
app.listen(3000);
4448
console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);

public/js/grapher.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var graph_data = []
33
var result = [];
44
var options = {
55
series: { shadowSize: 0 }, // drawing is faster without shadows
6-
yaxis: { min: 0, max: 50 },
6+
yaxis: { min: 0, max: 2 },
77
xaxis: { show: false }
88
};
99
socket.on('connect',function(data){
@@ -24,7 +24,7 @@ socket.on('connect',function(data){
2424
result = result.slice(-10);
2525
}
2626
plot.draw();
27-
setTimeout("",5000);
27+
setTimeout("",60000);
2828
socket.emit('received',data);
2929
});
3030

0 commit comments

Comments
 (0)