From 7b8dac062a110d393eb31ff838d6b286d83aeb86 Mon Sep 17 00:00:00 2001
From: tonyrewin <anton.rewin@gmail.com>
Date: Sun, 20 Nov 2022 06:16:56 +0300
Subject: [PATCH] devfixes

---
 orm/community.py |  2 +-
 server.py        | 60 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/orm/community.py b/orm/community.py
index f87c7dd7..63f104c6 100644
--- a/orm/community.py
+++ b/orm/community.py
@@ -42,4 +42,4 @@ class Community(Base):
                 session.add(d)
                 session.commit()
             Community.default_community = d
-            print('[migration] default community: %s' % d.id)
+            print('[orm] created default community with id %s' % d.id)
diff --git a/server.py b/server.py
index 7f92c3c9..584fc7e1 100644
--- a/server.py
+++ b/server.py
@@ -4,6 +4,50 @@ import uvicorn
 
 from settings import PORT
 
+log_settings = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'formatters': {
+        'default': {
+            '()': 'uvicorn.logging.DefaultFormatter',
+            'fmt': '%(levelprefix)s %(message)s',
+            'use_colors': None
+        },
+        'access': {
+            '()': 'uvicorn.logging.AccessFormatter',
+            'fmt': '%(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s'
+        }
+    },
+    'handlers': {
+        'default': {
+            'formatter': 'default',
+            'class': 'logging.StreamHandler',
+            'stream': 'ext://sys.stderr'
+        },
+        'access': {
+            'formatter': 'access',
+            'class': 'logging.StreamHandler',
+            'stream': 'ext://sys.stdout'
+        }
+    },
+    'loggers': {
+        'uvicorn': {
+            'handlers': ['default'],
+            'level': 'INFO'
+        },
+        'uvicorn.error': {
+            'level': 'INFO',
+            'handlers': ['default'],
+            'propagate': True
+        },
+        'uvicorn.access': {
+            'handlers': ['access'],
+            'level': 'INFO',
+            'propagate': False
+        }
+    }
+}
+
 if __name__ == "__main__":
     x = ""
     if len(sys.argv) > 1:
@@ -21,11 +65,23 @@ if __name__ == "__main__":
             ("Access-Control-Allow-Credentials", "true"),
         ]
         uvicorn.run(
-            "main:app", host="localhost", port=8080, headers=headers
+            "main:app",
+            host="localhost",
+            port=8080,
+            headers=headers,
+            # log_config=LOGGING_CONFIG,
+            log_level=None,
+            access_log=True
         )  # , ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)
     elif x == "migrate":
         from migration import migrate
 
         migrate()
     else:
-        uvicorn.run("main:app", host="0.0.0.0", port=PORT)
+        uvicorn.run(
+            "main:app",
+            host="0.0.0.0",
+            port=PORT,
+            proxy_headers=True,
+            server_header=True
+        )