fix hypercorn yaml logging config dependency

README.md

@@ -12,8 +12,6 @@ source venv/bin/activate
 pip install -r requirements.txt
 ```
 
-Double-check, that you get the correct version of starlette! https://github.com/tiangolo/fastapi/issues/4800
-
 For development, it is advised to install `nacsos-data` locally (not from git) via
 ```bash
 pip install -e ../nacsos-data/
@@ -21,8 +19,6 @@ pip install -e ../nacsos-data/
 (assuming both projects reside side-by-side, otherwise adapt path accordingly)
 If you do so, please keep in mind to update the requirements!
 
-There needs to be a change to the hypercorn code as per https://gitlab.com/pgjones/hypercorn/-/merge_requests/70/diffs
-
 ## Running the database with docker
 Start up the database by running docker (or use your local instance)
 ```bash

config/default.env

+LOG_CONF_FILE="config/logging.toml"
+
 SERVER__HOST="localhost"
 SERVER__PORT=8081
 SERVER__CORS_ORIGINS='["http://localhost:8080", "http://localhost:8081","http://localhost", "http://0.0.0.0:8081", "http://0.0.0.0", "http://127.0.0.1:8081", "http://127.0.0.1"]'

config/hypercorn.toml

@@ -4,4 +4,4 @@ access_log_format = '%(s)s | "%(R)s" |  Size: %(b)s | Referrer: "%(f)s"'
 workers = 1
 accesslog = 'hypercorn.access'
 errorlog = 'hypercorn.error'
-logconfig_dict = 'config/logging.conf'
\ No newline at end of file
+logconfig = 'toml:config/logging.toml'
\ No newline at end of file

config/logging.conf

-version: 1
-disable_existing_loggers: off
-formatters:
-    default:
-        (): server.util.logging.ColourFormatter
-        fmt: '%(asctime)s [%(levelnamec)s] %(name)s: %(message)s'
-        use_colors: on
-    process:
-        format: '%(asctime)s [%(levelname)s] %(processName)-10s %(name)s: %(message)s'
-    access:
-        format: '%(asctime)s [   REQ  ] %(name)s: %(message)s'
-handlers:
-    default:
-        level: DEBUG
-        formatter: default
-        class: logging.StreamHandler
-        stream: ext://sys.stdout
-    access:
-        level: DEBUG
-        formatter: access
-        class: logging.StreamHandler
-        stream: ext://sys.stdout
-loggers:
-    hypercorn.access:
-        handlers: [access]
-        level: DEBUG
-        propagate: no
-    hypercorn.error:
-        handlers: [default]
-        level: DEBUG
-    aiosqlite:
-        level: ERROR
-    databases:
-        level: ERROR
-    urllib3.connectionpool:
-        level: FATAL
-    multipart.multipart:
-        level: INFO
-    sqlalchemy.engine.Engine:
-        handlers: [default]
-        level: INFO
-        propagate: no
-    nacsos:
-        handlers: [default]
-        level: DEBUG
-        propagate: no
-    asyncio:
-      handlers: [default]
-      level: INFO
-      propagate: no
-    nacsos_data:
-        handlers: [default]
-        level: DEBUG
-        propagate: no
-root:
-    level: DEBUG
-    handlers: [default]
\ No newline at end of file

config/logging.toml

+version = 1
+disable_existing_loggers = false
+[root]
+level = "DEBUG"
+handlers = [ "default",]
+[formatters.default]
+"()" = "server.util.logging.ColourFormatter"
+fmt = "%(asctime)s [%(levelnamec)s] %(name)s: %(message)s"
+use_colors = true
+[formatters.process]
+format = "%(asctime)s [%(levelname)s] %(processName)-10s %(name)s: %(message)s"
+[formatters.access]
+format = "%(asctime)s [   REQ  ] %(name)s: %(message)s"
+[handlers.default]
+level = "DEBUG"
+formatter = "default"
+class = "logging.StreamHandler"
+stream = "ext://sys.stdout"
+[handlers.access]
+level = "DEBUG"
+formatter = "access"
+class = "logging.StreamHandler"
+stream = "ext://sys.stdout"
+[loggers."hypercorn.access"]
+handlers = [ "access",]
+level = "DEBUG"
+propagate = false
+[loggers."hypercorn.error"]
+handlers = [ "default",]
+level = "DEBUG"
+[loggers.aiosqlite]
+level = "ERROR"
+[loggers.databases]
+level = "ERROR"
+[loggers."urllib3.connectionpool"]
+level = "FATAL"
+[loggers."multipart.multipart"]
+level = "INFO"
+[loggers."sqlalchemy.engine.Engine"]
+handlers = [ "default",]
+level = "INFO"
+propagate = false
+[loggers.nacsos]
+handlers = [ "default",]
+level = "DEBUG"
+propagate = false
+[loggers.asyncio]
+handlers = [ "default",]
+level = "INFO"
+propagate = false
+[loggers.nacsos_data]
+handlers = [ "default",]
+level = "DEBUG"
+propagate = false
\ No newline at end of file

requirements.txt

 fastapi==0.80
-hypercorn==0.13.2
+hypercorn==0.14.3
 toml==0.10.2
 email-validator==1.2.1
 python-dotenv==0.20.0
 python-jose[cryptography]==3.3.0
 passlib[bcrypt]==1.7.4
-PyYAML==6.0
 httpx[http2]==0.23.0
 pymitter==0.4.0
 -e git+ssh://git@gitlab.pik-potsdam.de/mcc-apsis/nacsos/nacsos-data.git@b198aec2d46c46b41d7fc3005c8a99d6d74b6eaf#egg=nacsos_data
\ No newline at end of file

server/util/config.py

 from typing import Any
 import secrets
 import json
-import yaml
+import toml
 import os
 
 from pydantic import BaseSettings, BaseModel, PostgresDsn, AnyHttpUrl, EmailStr, validator
@@ -114,7 +114,7 @@ class Settings(BaseSettings):
         filename = values.get('LOG_CONF_FILE', None)
         if filename is not None:
             with open(filename, 'r') as f:
-                ret = yaml.safe_load(f.read())
+                ret = toml.loads(f.read())
                 if type(ret) == dict:
                     return ret
         raise ValueError('Logging config invalid!')