From d8b580d81ba3455e8c0603b92892e169cd4a88ca Mon Sep 17 00:00:00 2001 From: GordonFreeman-BY Date: Mon, 24 Jan 2022 03:16:01 +0300 Subject: [PATCH 1/2] Remove host varible from web server. --- olgram/settings.py | 4 ---- server/server.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/olgram/settings.py b/olgram/settings.py index ad08cda..ef4ed2e 100644 --- a/olgram/settings.py +++ b/olgram/settings.py @@ -54,10 +54,6 @@ class ServerSettings(AbstractSettings): def hook_port(cls) -> int: return int(cls._get_env("WEBHOOK_PORT")) - @classmethod - def app_host(cls) -> str: - return "olgram" - @classmethod def app_port(cls) -> int: return 80 diff --git a/server/server.py b/server/server.py index 97bbb49..727aa0f 100644 --- a/server/server.py +++ b/server/server.py @@ -65,5 +65,5 @@ def main(): runner = web.AppRunner(app) loop.run_until_complete(runner.setup()) logger.info("Server initialization done") - site = web.TCPSite(runner, host=ServerSettings.app_host(), port=ServerSettings.app_port(), ssl_context=context) + site = web.TCPSite(runner, port=ServerSettings.app_port(), ssl_context=context) return site From 880269d9d81360b37483cbb110caf95491b9d973 Mon Sep 17 00:00:00 2001 From: GordonFreeman-BY Date: Mon, 24 Jan 2022 03:43:16 +0300 Subject: [PATCH 2/2] Add possibility to set loglevel from environment. --- example.env | 3 +++ olgram/settings.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/example.env b/example.env index d62510a..02b44f2 100644 --- a/example.env +++ b/example.env @@ -24,3 +24,6 @@ WEBHOOK_PORT=8443 CUSTOM_CERT=true REDIS_PATH=redis://redis + +# Set log level, can be CRITICAL, ERROR, WARNING, INFO, DEBUG. By default it set to INFO. +LOGLEVEL= diff --git a/olgram/settings.py b/olgram/settings.py index ef4ed2e..7ca0c3a 100644 --- a/olgram/settings.py +++ b/olgram/settings.py @@ -1,6 +1,6 @@ from dotenv import load_dotenv from abc import ABC -import os +import os, logging from olgram.utils.crypto import Cryptor from functools import lru_cache @@ -83,6 +83,7 @@ class ServerSettings(AbstractSettings): def append_text(cls) -> str: return "\n\nЭтот бот создан с помощью @OlgramBot" + logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO")) class BotSettings(AbstractSettings): @classmethod