Funktioniert - im Docker

This commit is contained in:
2019-04-04 21:16:18 +02:00
parent 0af306aafb
commit 348666572e
5 changed files with 34 additions and 9 deletions

View File

@@ -26,6 +26,6 @@ fi
if [ $2 != "" ] if [ $2 != "" ]
then then
dat=`date +%Y%m%d%H%M` dat=`date +%Y%m%d%H%M`
ssh $2 "docker tag $1 $1:V_$dat" ssh -p 22022 $2 "docker tag $1 $1:V_$dat"
docker save $1 | bzip2 | pv | ssh $2 'bunzip2 | docker load' docker save $1 | bzip2 | pv | ssh -p 22022 $2 'bunzip2 | docker load'
fi fi

3
config.json Normal file
View File

@@ -0,0 +1,3 @@
{
"brenndauer": 7200
}

5
package-lock.json generated
View File

@@ -71,6 +71,11 @@
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==" "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
}, },
"await-fs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/await-fs/-/await-fs-1.0.0.tgz",
"integrity": "sha1-QAnTAIYz/WYlqgCfCm8aujY38wE="
},
"babel-runtime": { "babel-runtime": {
"version": "6.26.0", "version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",

View File

@@ -6,6 +6,7 @@
"start": "node ./bin/www >>/var/log/laufschrift.log 2>&1" "start": "node ./bin/www >>/var/log/laufschrift.log 2>&1"
}, },
"dependencies": { "dependencies": {
"await-fs": "^1.0.0",
"cookie-parser": "~1.4.3", "cookie-parser": "~1.4.3",
"debug": "~2.6.9", "debug": "~2.6.9",
"express": "~4.16.0", "express": "~4.16.0",

View File

@@ -2,10 +2,13 @@ var express = require('express');
let router = express.Router(); let router = express.Router();
let mqtt = require('mqtt'); let mqtt = require('mqtt');
let moment = require('moment'); let moment = require('moment');
let toSend = null; const fs = require('await-fs');
let tio;
const brenndauer = 300; // 20sec Relais ON
const configName = "config.json"
let brenndauer = 300; // 20sec Relais ON
// MQTT: // MQTT:
let MQTTHOST = process.env.MQTTHOST; let MQTTHOST = process.env.MQTTHOST;
@@ -13,20 +16,21 @@ let MQTTPORT = process.env.MQTTPORT;
let MQTTUSR = process.env.MQTTUSR; let MQTTUSR = process.env.MQTTUSR;
let MQTTPWD = process.env.MQTTPWD; let MQTTPWD = process.env.MQTTPWD;
/*
if (MQTTHOST === undefined) { MQTTHOST = 'localhost';} if (MQTTHOST === undefined) { MQTTHOST = 'localhost';}
if (MQTTPORT === undefined) { MQTTPORT = 1883;} if (MQTTPORT === undefined) { MQTTPORT = 1883;}
if (MQTTUSR === undefined) { MQTTUSR = "";} if (MQTTUSR === undefined) { MQTTUSR = "";}
if (MQTTPWD === undefined) { MQTTPWD = "";} if (MQTTPWD === undefined) { MQTTPWD = "";}
*/
/*
if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';} if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';}
if (MQTTPORT === undefined) { MQTTPORT = 1883;} if (MQTTPORT === undefined) { MQTTPORT = 1883;}
if (MQTTUSR === undefined) { MQTTUSR = "stwLauf";} if (MQTTUSR === undefined) { MQTTUSR = "stwLauf";}
if (MQTTPWD === undefined) { MQTTPWD = "37CrNcgP";} if (MQTTPWD === undefined) { MQTTPWD = "37CrNcgP";}
*/
// console.log("H",MQTTHOST," P",MQTTPORT," U",MQTTUSR," p",MQTTPWD);
console.log("H",MQTTHOST," P",MQTTPORT," U",MQTTUSR," p",MQTTPWD); let tio;
let connected = false; let connected = false;
let relais = 'MIST'; let relais = 'MIST';
let client = mqtt.connect("mqtt://" + MQTTHOST + ":" + MQTTPORT,{username: MQTTUSR, password: MQTTPWD}); let client = mqtt.connect("mqtt://" + MQTTHOST + ":" + MQTTPORT,{username: MQTTUSR, password: MQTTPWD});
@@ -53,6 +57,18 @@ client.on('reconnect', function(){
// beim start mal den Zustand abfragen // beim start mal den Zustand abfragen
doPublish(""); doPublish("");
// Konfig einlesen und entsprechende Variablen einstellen
(async () => {
try{
let json = await fs.readFile('config.json','utf8')
js = JSON.parse(json);
brenndauer = js.brenndauer;
console.log(brenndauer);
}catch(err){
console.log(err)
}
})()
function doPublish(payload) { function doPublish(payload) {
// retur.relais='pending'; // retur.relais='pending';