diff --git a/Dockerfile b/Dockerfile index 215419f..2641011 100644 --- a/Dockerfile +++ b/Dockerfile @@ -83,6 +83,7 @@ COPY setup.py requirements.txt requirements-dev.txt LICENSE.txt ./ RUN pip3 install --editable . # install the config files +COPY vasl_templates/webapp/config/logging.yaml.example ./vasl_templates/webapp/config/logging.yaml COPY docker/config/ ./vasl_templates/webapp/config/ # create a new user diff --git a/docker/config/.gitignore b/docker/config/.gitignore new file mode 100644 index 0000000..2fea518 --- /dev/null +++ b/docker/config/.gitignore @@ -0,0 +1 @@ +logging.yaml diff --git a/docker/config/logging.yaml b/docker/config/logging.yaml deleted file mode 100644 index a9011d9..0000000 --- a/docker/config/logging.yaml +++ /dev/null @@ -1,43 +0,0 @@ -version: 1 - -formatters: - standard: - format: "%(asctime)s.%(msecs)03d | %(message)s" - datefmt: "%H:%M:%S" - -handlers: - console: - class: "logging.StreamHandler" - formatter: "standard" - stream: "ext://sys.stdout" - file: - class: "logging.FileHandler" - formatter: "standard" - filename: "/tmp/vasl-templates.log" - mode: "w" - -loggers: - werkzeug: - level: "WARNING" - handlers: [ "file" ] - vasl_mod: - level: "WARNING" - handlers: [ "file" ] - update_vsav: - level: "WARNING" - handlers: [ "file" ] - analyze_vsav: - level: "WARNING" - handlers: [ "file" ] - analyze_vlog: - level: "WARNING" - handlers: [ "file" ] - webdriver: - level: "WARNING" - handlers: [ "file" ] - downloads: - level: "WARNING" - handlers: [ "file" ] - control_tests: - level: "INFO" - handlers: [ "console", "file" ] diff --git a/vasl_templates/webapp/config/logging.yaml.example b/vasl_templates/webapp/config/logging.yaml.example index c9b5968..e79f773 100644 --- a/vasl_templates/webapp/config/logging.yaml.example +++ b/vasl_templates/webapp/config/logging.yaml.example @@ -1,4 +1,5 @@ # This is a sample config file for Python logging - rename it as logging.yaml. +# It also gets deployed into the Docker container, unless you create $/docker/config/logging.yaml. version: 1 @@ -8,6 +9,10 @@ formatters: datefmt: "%H:%M:%S" handlers: + console: + class: "logging.StreamHandler" + formatter: "standard" + stream: "ext://sys.stdout" file: class: "logging.FileHandler" formatter: "standard" @@ -16,32 +21,45 @@ handlers: root: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] loggers: werkzeug: - level: "WARNING" - handlers: [ "file" ] + level: "ERROR" + handlers: [ "console", "file" ] + propagate: 0 javascript: level: "INFO" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 qt: level: "INFO" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 vasl_mod: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 + vassal_shim: + level: "WARNING" + handlers: [ "console", "file" ] + propagate: 0 update_vsav: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 analyze_vsav: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 analyze_vlog: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 webdriver: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0 downloads: level: "WARNING" - handlers: [ "file" ] + handlers: [ "console", "file" ] + propagate: 0