diff --git a/routes/temp.js b/routes/temp.js index 37c5e9c..5d0f9fc 100644 --- a/routes/temp.js +++ b/routes/temp.js @@ -41,7 +41,7 @@ function connectDB() { "use strict"; logger.debug('Connect db.'); temp_db = new sqlite3.Database(file); - console.log(temp_db); + logger.log(temp_db); return temp_db; } @@ -54,12 +54,12 @@ function createTable() { function closeDB() { "use strict"; - console.log('Closing db.'); + logger.log('Closing db.'); temp_db.close(); } function insertTempReading(time, reading) { - console.log('Inserting reading:' + reading); + logger.log('Inserting reading:' + reading); // var sql = db.prepare('INSERT into temperature(date, reading) VALUES // (?,?)',[time],[reading]); @@ -77,8 +77,8 @@ function insertTempReading(time, reading) { var t = req.query; - console.log('t:'); - console.log(JSON.stringify(t)); + logger.log('t:'); + logger.log(JSON.stringify(t)); if (req.query != {} && req.query.temp != null) { // createDB(); @@ -98,7 +98,7 @@ function insertTempReading(time, reading) { /*router.get('/:id', function (req, res, next) { var id = req.params.id; - console.log('id: ' + id); + logger.log('id: ' + id); res.writeHead(200, {"ContentType": "text/html"}); //res.send(JSON.stringify(t)); res.end('ok'); @@ -109,8 +109,8 @@ router.get('/reading', function (req, res, next) { var t = req.query; - console.log('t:'); - console.log(JSON.stringify(t)); + logger.log('t:'); + logger.log(JSON.stringify(t)); res.writeHead(200, {"ContentType": "application/json"}); //res.send(JSON.stringify(t)); @@ -124,16 +124,11 @@ router.post('/', function (req, res, next) { var t = req.body; var now = new Date(); var dataJSON; - console.log('~~~~'); - logger.debug(t); - console.log(typeof t); - //t = JSON.parse(t); + if(t.hasOwnProperty('data')){ - logger.debug('We have data'); var data = JSON.parse(t.data.toString()); if (data.hasOwnProperty('temp')) { - logger.log('We have temp! ' + data.temp); busEmitter.emit("saveTempData", {time: now.toJSON(), value: parseFloat(data.temp)}); } else @@ -153,16 +148,16 @@ router.post('/', function (req, res, next) { router.get('/all', function (req, res, next) { "use strict"; - console.log('Selecint all..'); + logger.log('Selecint all..'); var db = connectDB(); db.all('SELECT * from temp', function (err, rows) { var out = []; - console.log(err); - console.log(rows); + logger.log(err); + logger.log(rows); rows.forEach(function (row) { - console.log(row.date + ', ' + row.reading); + logger.log(row.date + ', ' + row.reading); // var t = ; // out.push({"date": Date(row.date), "reading":row.reading}); out.push({"date": row.date, "reading": row.reading});