Moved cumulative data into own topics ready for generic cumulative data solution

stevetrease · stevetrease · commit 8340a3dfab9b · 2013-05-17T09:05:00.000+01:00
diff --git a/mqtt/pages/sensors.html b/mqtt/pages/sensors.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>
-Charlestown Power
+Charlestown Sensors
 </title>
 <link type="text/css" rel="stylesheet" href="/app.css" media="all">
 </head>
@@ -11,9 +11,9 @@
 <span id="sensors/power/0"> </span>W
 </big></big></big>
 <P>
-<span id="sensors/power/0powercumulativeToday"></span> KWh used today
+<span id="sensors/power/0/cumulative/today"></span> KWh used today
 <br>
-<span id="sensors/power/0powercumulativeHour"></span> KWh this hour
+<span id="sensors/power/0/cumulative/hour"></span> KWh this hour
 <P>
 <canvas id="mycanvas" width="500" height="150"></canvas>
 <P>
diff --git a/mqtt/server-stats.js b/mqtt/server-stats.js
@@ -60,8 +60,8 @@ mqttclient.on('connect', function() {
 			redisClient.set("powercumulativeToday", powercumulativeToday);
 			redisClient.set("powercumulativeHour", powercumulativeHour);
 			// console.log("duration ", duration, "period ", powerused, "today ", powercumulativeToday, "hour ", powercumulativeHour);
-			mqttclient.publish("sensors/power/0powercumulativeToday", powercumulativeToday.toFixed(2));
-			mqttclient.publish("sensors/power/0powercumulativeHour", powercumulativeHour.toFixed(2));
+			mqttclient.publish("sensors/power/0/cumulative/today", powercumulativeToday.toFixed(2));
+			mqttclient.publish("sensors/power/0/cumulative/hour", powercumulativeHour.toFixed(2));
 			powerlasttime = powercurrenttime;
 		}
   	});
diff --git a/mqtt/server.js b/mqtt/server.js
@@ -13,33 +13,22 @@ var config = require('./config.json');
 //	A whole load of very clumsy routing for static pages and js 
 //
 //	First of all log all connections
-app.use(function(req, res, next){
-	console.log('one connection %j %s %s',  req.connection.remoteAddress, req.method, req.url);
-  	next();
-});
-app.get('/smoothie.js', function (req, res) {
-	res.sendfile(__dirname + '/pages/js/smoothie.js');
-});
-app.get('/jquery.min.js', function (req, res) {
-	res.sendfile(__dirname + '/pages/js/jquery.min.js');
-});
-app.get('/app.css', function (req, res) {
-	res.sendfile(__dirname + '/pages/app.css');
-});
-app.get('/sensors', function(req, res) {
-	res.sendfile(__dirname + '/pages/sensors.html');
-});
-app.get('/mqtt', function(req, res) {
-	res.sendfile(__dirname + '/pages/mqtt.html');
-});
-app.get('/mqttstats', function(req, res) {
-	res.sendFile(__dirname + '/pages/mqttstats.html');
-});
-app.get('/stats', function(req, res){
+app.use(express.logger());
+app.use(express.compress());
+
+app.get('/stats', function(req, res, next){
 	console.log('This process is pid ' + process.pid + " with an uptime of " + process.uptime());
 	console.log('Running on ' + process.platform + ' (' + process.arch + ')');
 });
 
+app.use(express.static(__dirname + '/pages'));
+app.use(express.static(__dirname + '/pages/js'));
+
+// and finally a 404
+app.use(function(req, res, next){
+  res.send(404, 'Sorry cant find that!');
+});
+
 
 
 
@@ -58,6 +47,7 @@ io.of('/sensors').on('connection', function (socket) {
 
 	mqttclient.on('connect', function() {
 		mqttclient.subscribe('sensors/+/+');
+		mqttclient.subscribe('sensors/power/+/cumulative/+');
 		// console.log('subscribing to sensors/+/+ on ' + config.mqtt.host + '(' + config.mqtt.port + ')');
 
   		mqttclient.on('message', function(topic, message) {
