From 0dcd33a7f174c20b72e0be79c390cbe505883677 Mon Sep 17 00:00:00 2001 From: Patrick Baus Date: Tue, 21 Jan 2025 16:57:51 +0100 Subject: [PATCH] Refactoring (#35) * Refactored Dockerfile to reduce number of layers * Reworded logger message of a successful connection attempt to make it clearer --- Dockerfile | 3 +-- database_logger.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d975d5a..1235a73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,8 +48,7 @@ COPY --from=builder /opt/venv /opt/venv # Enable venv ENV PATH="/opt/venv/bin:$PATH" -COPY --from=builder /app /app -RUN chown -R worker:worker /app +COPY --from=builder --chown=worker:worker /app /app USER worker diff --git a/database_logger.py b/database_logger.py index 26d2b03..e680811 100755 --- a/database_logger.py +++ b/database_logger.py @@ -193,7 +193,7 @@ async def mqtt_producer( **mqtt_config.model_dump(exclude={"hosts"}), clean_session=not bool(mqtt_config.identifier), ) as client: - self.__logger.info("Connected producer to MQTT broker at '%s:%i'", hostname, port) + self.__logger.info("Successfully connected producer to MQTT broker at '%s:%i'", hostname, port) await client.subscribe("sensors/#", qos=2) async for message in client.messages: # if message.topic.matches("sensors/+/+/+"): @@ -286,7 +286,7 @@ async def mqtt_consumer( **database_config.model_dump(exclude={"host"}), ) as conn: self.__logger.info( - "Connected consumer (%s) to database at '%s:%i", + "Successfully connected consumer (%s) to database at '%s:%i", worker_name, *database_config.host, )