diff --git a/.gitignore b/.gitignore index cd29e0e2ea88ba4b0da39d6f9f9a6985d537f14a..bf6da016aac79404fe50a8cb363fdb3435ee28c6 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ venv.bak/ *.1 *.2 *.3 +.vscode/settings.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52fce24c6924dae6b150c52a8194e9959ed76c7b..f833ab3fed099a3fa0374143abcc308ed705e223 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,8 @@ Copy To Container: - taskkill /FI "WINDOWTITLE eq $env:UUID" - Remove-Item -Recurse -Force -Path E:\apps\$env:UUID\* - Copy-Item * -Destination E:\apps\$env:UUID\ -Recurse - - Copy-Item $env:SECRETS\$env:UUID\config.json -Destination E:\apps\$env:UUID\ + # - Copy-Item $env:SECRETS\$env:UUID\config.json -Destination E:\apps\$env:UUID\ + - fsutil hardlink create E:\apps\$env:UUID\config.json $env:SECRETS\$env:UUID\config.json Restart: diff --git a/influx_translator.py b/influx_translator.py index abf0d89b346b4df53054948bd1d2b7c6f3eaa61f..5f1fb69d6688c06da54f5a25e117026acbf03f7e 100644 --- a/influx_translator.py +++ b/influx_translator.py @@ -140,7 +140,7 @@ class MQTT2InfluxDB: # reconnect then subscriptions will be renewed. for topic in self.topic_list_db: # print(topic) - client.subscribe(topic + "/#") + client.subscribe(topic + "/#", 1) def on_message(self, client, userdata, msg): @@ -174,7 +174,9 @@ class MQTT2InfluxDB: logger.debug("### CONTENT DICT ### \n" + str(payload_dict)) self.to_database(topic=msg.topic, payload=payload_dict) except Exception as e: - logger.error(e) + logger.error(f'{e} - {msg.topic}: {msg.payload.decode("utf-8")}') + # logger.error(msg.topic) + # logger.error(msg.payload.decode("utf-8")) logger.info(str(1000 * (time.perf_counter() - starttime)) + " ms") def to_database(self, topic, payload): @@ -207,7 +209,7 @@ class MQTT2InfluxDB: [ self.topic_list_db[topic_list[0]], { - "measurement": measurement, + "measurement": measurement.lower(), "tags": tags, "fields": fields, "time": payload["timestamp"],