diff --git a/Dockerfile b/Dockerfile index 58aa24e..746da00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get purge -y curl git build-essential \ && rm -rf /var/apt/lists/* \ && rm -rf /var/cache/apt/* -FROM install as app-image +FROM install AS app-image ENV PYTHONPATH=/home/code/ PYTHONHASHSEED=0 diff --git a/config.ini b/config.ini deleted file mode 100644 index 7168ba8..0000000 --- a/config.ini +++ /dev/null @@ -1,48 +0,0 @@ -[loggers] -keys = root, sqlalchemy.engine.Engine, uvicorn.access - -[handlers] -keys = stream, sqlalchemy, uvicorn - -[formatters] -keys = default - -[logger_root] -level = INFO -propagate = 0 -handlers = stream - -[logger_sqlalchemy.engine.Engine] -level = INFO -propagate = 0 -handlers = sqlalchemy -qualname = sqlalchemy.engine.Engine - -[logger_uvicorn.access] -level = INFO -propagate = 0 -handlers = uvicorn -qualname = uvicorn.access - -[handler_stream] -class = app.utils.logging.RichConsoleHandler -kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True, "rich_tracebacks": True} -args = (140, "white") -formatter = default -stream = ext://sys.stdout - -[handler_sqlalchemy] -class = app.utils.logging.RichConsoleHandler -kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True, "rich_tracebacks": True} -args = (140, "magenta") -formatter = default - -[handler_uvicorn] -class = app.utils.logging.RichConsoleHandler -kwargs = {"omit_repeated_times":True, "show_time": False, "enable_link_path": False, "tracebacks_show_locals": True, "rich_tracebacks": True} -args = (140, "yellow") -formatter = default - -[formatter_default] -format = [%(process)d|%(name)-12s] %(message)s -class = logging.Formatter \ No newline at end of file diff --git a/uvicorn-logging.json b/uvicorn-logging.json index b96af62..50d8719 100644 --- a/uvicorn-logging.json +++ b/uvicorn-logging.json @@ -29,16 +29,35 @@ "formatter": "default", "width": 140, "style": "magenta" + }, + "stream": { + "class": "app.utils.logging.RichConsoleHandler", + "omit_repeated_times": true, + "show_time": false, + "enable_link_path": false, + "tracebacks_show_locals": true, + "rich_tracebacks": true, + "formatter": "default", + "width": 140, + "style": "white" } }, "loggers": { "root": { "handlers": [ - "uvicorn" + "stream" ], "propagate": false, "level": "TRACE" }, + "uvicorn.access": { + "handlers": [ + "uvicorn" + ], + "propagate": false, + "level": "TRACE", + "qualname": "uvicorn.access" + }, "sqlalchemy.engine.Engine": { "handlers": [ "sqlalchemy"