rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved logs into openflexure logs folder

Browse source
This commit is contained in:
jtc42 2020-01-24 18:08:07 +00:00
parent 6df7fe9405
commit b39a0653f2
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openflexure_microscope/api/app.py
View file

@ -19,6 +19,7 @@ from openflexure_microscope.paths import (
OPENFLEXURE_VAR_PATH, OPENFLEXURE_VAR_PATH,
OPENFLEXURE_EXTENSIONS_PATH, OPENFLEXURE_EXTENSIONS_PATH,
settings_file_path, settings_file_path,
logs_file_path
) )
from labthings.server.quick import create_app from labthings.server.quick import create_app
@ -31,7 +32,7 @@ from openflexure_microscope.api.v2 import views
# Handle logging # Handle logging
is_gunicorn = "gunicorn" in os.environ.get("SERVER_SOFTWARE", "") 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() logger = logging.getLogger()
if (__name__ == "__main__") or (not is_gunicorn): if (__name__ == "__main__") or (not is_gunicorn):

4
openflexure_microscope/paths.py
View file

@ -23,6 +23,10 @@ def extensions_file_path(filename: str):
return os.path.join(OPENFLEXURE_VAR_PATH, "extensions", filename) 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 # HANDLE DEFAULTS FILES STORED IN THIS APPLICATION
HERE = os.path.abspath(os.path.dirname(__file__)) HERE = os.path.abspath(os.path.dirname(__file__))