Merge pull request #87 from CSIRO-enviro-informatics/ash_changes

Logging level changes for prod

Dockerfile

@@ -1,14 +1,15 @@
-FROM sanicframework/sanic:LTS AS base
+FROM sanicframework/sanic:20.12.2 AS base
 
 WORKDIR /usr/src/app
 RUN apk update && \
     apk add postgresql-dev
 COPY . .
 RUN pip install -U setuptools pip
 RUN apk add --no-cache git
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN pip3 install --no-cache-dir "uvicorn[standard]"
 
-ENTRYPOINT [ "python3", "./app.py" ]
+ENTRYPOINT ["uvicorn", "--host", "0.0.0.0", "--port", "8080", "--log-level", "warning", "--no-access-log", "--factory", "app:create_app"]
 
 FROM base AS devmode
 #RUN pip install --no-cache-dir -r dev-requirements.txt
@@ -20,4 +21,4 @@ RUN apk add --no-cache vim
 ENTRYPOINT [ "tail", "-f", "/dev/null" ]
 
 
-FROM base 
+FROM base

app.py

@@ -2,20 +2,22 @@
 # -*- coding: utf-8 -*-
 """
 LOCI Integrator API
-Copyright 2019 CSIRO Land and Water
+Copyright 2021 CSIRO Land and Water
 
 @author Ashley Sommer <Ashley.Sommer@csiro.au>
 @author Ben Leighton <Benjamin.Leighton@csiro.au>
 """
 __authors__ = "Ashley Sommer, Ben Leighton"
 __email__ = "Ashley.Sommer@csiro.au"
 __maintainer__ = "Ashley Sommer <Ashley.Sommer@csiro.au>"
-__copyright__ = "Copyright 2019 CSIRO Land and Water"
+__copyright__ = "Copyright 2021 CSIRO Land and Water"
 __license__ = "TBD"  # Open source or proprietary? Apache 2.0, or MIT?
 __version__ = "0.0.1"
 
 import os
+from copy import copy
 from sanic import Sanic
+from sanic.log import LOGGING_CONFIG_DEFAULTS
 from sanic.request import Request
 from sanic.response import HTTPResponse
 from spf import SanicPluginsFramework
@@ -28,7 +30,10 @@
 gitlabel = subprocess.check_output(["git", "describe", "--always"]).strip().decode("utf-8")
 
 def create_app():
-    app = Sanic(__name__)
+    LOG_CONFIG = copy(LOGGING_CONFIG_DEFAULTS)
+    LOG_CONFIG['loggers']['sanic.error']['level'] = "WARNING"  # Default is INFO
+    LOG_CONFIG['loggers']['sanic.access']['level'] = "WARNING"  # Default is INFO
+    app = Sanic(__name__, log_config=LOG_CONFIG, configure_logging=True)
     spf = SanicPluginsFramework(app)
     app.config['LOGO'] = r"""
      _     ___   ____ ___   ___ _   _ _____ _____ ____ ____     _  _____ ___  ____       _    ____ ___
@@ -72,17 +77,16 @@ def index(request):
         html = "<h1>LOCI Integration API</h1>\
         <a href=\"api/v1/doc\">Click here to go to the swaggerui doc page.</a>\
         <pre>Git commit: <a href=\"{prefix}{commit}\">{commit}</a></pre>".format(
-              prefix="https://github.com/CSIRO-enviro-informatics/loci-integration-api/commit/", 
+              prefix="https://github.com/CSIRO-enviro-informatics/loci-integration-api/commit/",
               commit=str(gitlabel))
         return HTTPResponse(html, status=200, content_type="text/html")
 
     return app
 
-
 if __name__ == "__main__":
     # Has run from the command line.
     # This section will not be called if run via Gunicorn or mod_wsgi
     LISTEN_HOST = "0.0.0.0"
     LISTEN_PORT = 8080
     app = create_app()
-    app.run(LISTEN_HOST, LISTEN_PORT, debug=True, auto_reload=False)
+    app.run(LISTEN_HOST, LISTEN_PORT, debug=False, auto_reload=False)

requirements.txt

@@ -1,7 +1,7 @@
-sanic>=19.12.2,<19.13
-sanic-plugins-framework>=0.9.2,<0.10
+sanic>=20.12.1,<21
+sanic-plugins-framework>=0.9.5,<0.10
 sanic-cors>=0.10.0.post3,<0.11
-sanic-restplus>=0.5.2,<0.6
-aiohttp>=3.5.0,<3.6
+sanic-restplus>=0.5.5,<0.6
+aiohttp>=3.7.0,<3.8
 asyncpg>=0.18.3,<0.19
 psycopg2-binary==2.8.5