From b39a0653f27ea06a3415d6dc6c1f94cdb3fcc9be Mon Sep 17 00:00:00 2001 From: jtc42 Date: Fri, 24 Jan 2020 18:08:07 +0000 Subject: [PATCH] Moved logs into openflexure logs folder --- openflexure_microscope/api/app.py | 3 ++- openflexure_microscope/paths.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py index 4b6fa948..7f688fe0 100644 --- a/openflexure_microscope/api/app.py +++ b/openflexure_microscope/api/app.py @@ -19,6 +19,7 @@ from openflexure_microscope.paths import ( OPENFLEXURE_VAR_PATH, OPENFLEXURE_EXTENSIONS_PATH, settings_file_path, + logs_file_path ) from labthings.server.quick import create_app @@ -31,7 +32,7 @@ from openflexure_microscope.api.v2 import views # Handle logging is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "") -DEFAULT_LOGFILE = settings_file_path("openflexure_microscope.log") +DEFAULT_LOGFILE = logs_file_path("openflexure_microscope.log") logger = logging.getLogger() if (__name__ == "__main__") or (not is_gunicorn): diff --git a/openflexure_microscope/paths.py b/openflexure_microscope/paths.py index 4fbcfd53..a261d618 100644 --- a/openflexure_microscope/paths.py +++ b/openflexure_microscope/paths.py @@ -23,6 +23,10 @@ def extensions_file_path(filename: str): return os.path.join(OPENFLEXURE_VAR_PATH, "extensions", filename) +def logs_file_path(filename: str): + """Generate a full file path for a filename to be stored in server logs""" + return os.path.join(OPENFLEXURE_VAR_PATH, "logs", filename) + # HANDLE DEFAULTS FILES STORED IN THIS APPLICATION HERE = os.path.abspath(os.path.dirname(__file__))