diff --git a/dht.js b/dht.js index 5ab040a..60f1b18 100644 --- a/dht.js +++ b/dht.js @@ -1,4 +1,7 @@ // ./src/index.js +var GardenIP = '192.168.1.133'; +var AcIP = '192.168.1.143'; +var HouseDhtIP = '192.168.1.126'; // importing the dependencies const util = require('util'); @@ -48,7 +51,6 @@ var ir = require('./src/devices/ir'); var u = require('./src/utils'); - app.use(auth.init()); app.get('/', function(req, res){ res.redirect('/n/login');}); @@ -80,7 +82,7 @@ function(req, res){ //break it //code = code.substring(150); //console.log("RAW: " + code); - if(ir.SendCmd("http://192.168.1.143", code)) + if(ir.SendCmd("http://"+AcIP, code)) { console.log("OK. Temp: " + req.body.temp); BroadcastWS(ac.Tlc112.GetState()); @@ -117,13 +119,13 @@ app.use('/waterTest',function(req, res){ app.use('/water',function(req, res){ var time = req.query.t; console.log("Watering cmd for: " + time); - request('http://192.168.1.109/control?cmd=event,manualwatering='+ time, { json: true }, (err, res, body) => { + request('http://'+GardenIP+'/control?cmd=event,manualwatering='+ time, { json: true }, (err, res, body) => { if (err) { return console.log("Problem watering: " + err); } console.log("Watering cmd successfully sent!"); }); }); app.use('/waterStop',function(req, res){ - request('http://192.168.1.109/control?cmd=event,stopwatering', { json: true }, (err, res, body) => { + request('http://'+GardenIP+'/control?cmd=event,stopwatering', { json: true }, (err, res, body) => { if (err) { return console.log("Problem watering: " + err); } console.log("STOP watering cmd sent!"); }); @@ -193,10 +195,10 @@ else wss.on('connection', ws => { ws.on('message', message => { - console.log(`Received message => ${message}`) - }) - ws.send('ho!') -}) + console.log('Received message => ${message}'); + }); + ws.send('ho!'); +}); var mosca = require('mosca'); @@ -359,6 +361,9 @@ function SaveDhtIf(){ }); dht = {}; }else{ + if(dht.Temp ){console.log("have Temp");} + if(dht.Hum ){console.log("have Hum");} + if(dht.Pres ){console.log("have Pres");} console.log("Missing all data to write to DB !"); } } @@ -370,3 +375,56 @@ function SaveDhtIf(){ // fs.writeFileSync('./log.txt', msg); // } //})(); + +const {keys} = Object; +const {Console} = console; + +/** + * Redirect console to a file. Call without path or with false-y + * value to restore original behavior. + * @param {string} [path] + */ +function file(path) { + const con = path ? new Console(fs.createWriteStream(path)) : null; + + keys(Console.prototype).forEach(key => { + if (path) { + this[key] = (...args) => con[key](...args); + } else { + delete this[key]; + } + }); +}; + +// ///---patch global console object and export +module.exports = console.file = file; + +console.file(__dirname + '/../log.txt');//__dirname + '/debug.log' log.txt + + + + +var log4js = require("log4js"); +log4js.configure({ + appenders: { + file: { + type: 'file', + filename: '/../log4.txt', + maxLogSize: 10 * 1024 * 1024, // = 10Mb + backups: 5, // keep five backup files + compress: true, // compress the backups + encoding: 'utf-8', + mode: 0o0640, + flags: 'w+' + }, + console: { type: 'console' } + },categories: { + default: { appenders: ['console','file'], level: 'trace' } + } +}); + +var logger = log4js.getLogger(); +logger.level = "debug"; +logger.debug("Some debug messages"); +console.log = (msg) => logger.trace(msg); +console.log("Console MSG"); diff --git a/log.txt b/log.txt deleted file mode 100644 index b97412a..0000000 --- a/log.txt +++ /dev/null @@ -1 +0,0 @@ -HTTPS server listening on port 8443 \ No newline at end of file