From 476458303bdf7b5dc750200b2d94d533d7306b8c Mon Sep 17 00:00:00 2001 From: Emanuele Date: Fri, 26 Feb 2021 12:14:40 +0100 Subject: [PATCH] cose --- config-grande.json | 2 +- config-piccola.json | 2 +- nasomain.py | 6 ++++-- nasoscopio-grande.service | 2 +- nasoscopio-piccola.service | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config-grande.json b/config-grande.json index be22085..f6596c6 100644 --- a/config-grande.json +++ b/config-grande.json @@ -3,7 +3,7 @@ "logFile": "/home/briq/logs/nasoscopio-grande.log", "logFormat": "%(asctime)s|%(levelname)-7s|%(funcName)-10s|%(lineno)-3d: %(message)-50s", "logTimeFormat": "%m-%d %H:%M:%S", - "URL": "http://localhost:8880", + "URL": "http://localhost:8080", "samplePeriod": 10, "loopPeriod": 0.5, "recordTime": 3600, diff --git a/config-piccola.json b/config-piccola.json index 5793dd5..8ef3c4e 100644 --- a/config-piccola.json +++ b/config-piccola.json @@ -3,7 +3,7 @@ "logFile": "/home/briq/logs/nasoscopio-piccola.log", "logFormat": "%(asctime)s|%(levelname)-7s|%(funcName)-10s|%(lineno)-3d: %(message)-50s", "logTimeFormat": "%m-%d %H:%M:%S", - "URL": "http://localhost:8881", + "URL": "http://localhost:8081", "samplePeriod": 10, "loopPeriod": 0.5, "recordTime": 3600, diff --git a/nasomain.py b/nasomain.py index e7cca16..d8503eb 100644 --- a/nasomain.py +++ b/nasomain.py @@ -341,7 +341,7 @@ if __name__ == '__main__': for idx,rec in enumerate(tempSamples[ax][reg]): tempSamples[ax][reg][idx]=(tempSamples[ax][reg][idx][templates.SAM_TS], tempSamples[ax][reg][idx][templates.SAM_VAL]) - if not settings["sendMqtt"]: + if settings["sendMqtt"]: if tempSamples[ax][reg][idx][templates.SAM_TS] > settings["recordTime"]: samples[ax][reg] = samples[ax][reg][-(len(samples)-len(tempSamples)):] if bufferFull < 1: @@ -356,7 +356,7 @@ if __name__ == '__main__': samples[ax][reg]+=tempSamples[ax][reg] else: sendSamples(tempSamples) - else: + elif settings['sendInflux']: influxMeas = list() for idx,record in enumerate(tempSamples[ax][reg]): ts = tempSamples[ax][reg][idx][templates.SAM_TS]+firstTS*1000000 @@ -376,6 +376,8 @@ if __name__ == '__main__': LOGGER.error(f'Impossibile scrivere nel database: {e}') LOGGER.error(f'TS da controllo: {datetime.fromtimestamp(ts).strftime("%d/%m/%y_%H:%M:%S,%f")}') stat='STOP' + else: + pass pass pass pass diff --git a/nasoscopio-grande.service b/nasoscopio-grande.service index fb8a3e6..0e33c06 100644 --- a/nasoscopio-grande.service +++ b/nasoscopio-grande.service @@ -7,7 +7,7 @@ RestartSec=15s Type=simple User=briq Group=briq -WorkingDirectory=/root/NasoScopio/NasoScope/ +WorkingDirectory=/home/briq/NasoScopio/ ExecStart=/usr/bin/python3 nasomain.py config-grande.json PIDFile=/run/nasoscopio-grande.pid Restart=always diff --git a/nasoscopio-piccola.service b/nasoscopio-piccola.service index 4c35abb..21db593 100644 --- a/nasoscopio-piccola.service +++ b/nasoscopio-piccola.service @@ -7,7 +7,7 @@ RestartSec=15s Type=simple User=briq Group=briq -WorkingDirectory=/home/briq/Nasoscopio/ +WorkingDirectory=/home/briq/NasoScopio/ ExecStart=/usr/bin/python3 nasomain.py config-piccola.json PIDFile=/run/nasoscopio-piccola.pid Restart=always