From 07e4b9d2de92a0c9dd0b91936323e1553f0724cb Mon Sep 17 00:00:00 2001 From: Andreas Berthoud Date: Mon, 2 Aug 2021 18:15:33 +0200 Subject: [PATCH] stash --- backend/dockerfile | 2 ++ backend/monsun_backend/command_execution.py | 5 ++++- backend/monsun_backend/container.py | 1 + backend/uwsgi.ini | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/dockerfile b/backend/dockerfile index 5059604..3ec95f8 100644 --- a/backend/dockerfile +++ b/backend/dockerfile @@ -10,3 +10,5 @@ RUN apt-get update \ && apt-get -y install nginx \ && apt-get -qy install netcat \ && pip install --upgrade setuptools wheel + +COPY nginx.conf /etc/nginx diff --git a/backend/monsun_backend/command_execution.py b/backend/monsun_backend/command_execution.py index d301009..fb0b316 100644 --- a/backend/monsun_backend/command_execution.py +++ b/backend/monsun_backend/command_execution.py @@ -89,7 +89,10 @@ def worker_process( awaiting_response_identifier_list=awaiting_response_identifier_list, heartbeat_interval=heartbeat_interval, ) - except OSError: + except OSError as e: + logger.exception(e) + import os + logger.info(f"user id: {os.getuid()}") if connected: logger.warning("connection to serial device lost") connected = False diff --git a/backend/monsun_backend/container.py b/backend/monsun_backend/container.py index 6175ab0..1cc8ef5 100644 --- a/backend/monsun_backend/container.py +++ b/backend/monsun_backend/container.py @@ -40,6 +40,7 @@ def get_initialize_container( container.config.from_yaml(CONFIG_FILE, required=True) user_config = Path.cwd() / "config.yml" + logger.debug(user_config) if user_config.is_file(): logger.debug(f"initialize container from user config file: {user_config}") container.config.from_yaml(user_config, required=True) diff --git a/backend/uwsgi.ini b/backend/uwsgi.ini index 7b0ad7f..47232f1 100644 --- a/backend/uwsgi.ini +++ b/backend/uwsgi.ini @@ -3,10 +3,10 @@ wsgi-file = wsgi.py uid = www-data gid = www-data master = true -processes = 1 +processes = 5 socket = /tmp/uwsgi.socket chmod-sock = 664 vacuum = true -die-on-term = true \ No newline at end of file +die-on-term = true