Merge pull request #6 from alkem-io/develop

Release v0.0.3

alkemio_virtual_contributor_engine/alkemio_vc_engine.py

@@ -5,11 +5,10 @@
 
 from aio_pika.abc import AbstractIncomingMessage
 
-from alkemio_virtual_contributor_engine.config import env
 from alkemio_virtual_contributor_engine.events.input import Input
 from alkemio_virtual_contributor_engine.events.response import Response
 from alkemio_virtual_contributor_engine.rabbitmq import RabbitMQ
-from logger import setup_logger
+from alkemio_virtual_contributor_engine.setup_logger import setup_logger
 
 
 logger = setup_logger(__name__)

alkemio_virtual_contributor_engine/config.py

@@ -28,6 +28,9 @@ class Env:
     rabbitmq_exchange: str
     rabbitmq_result_routing_key: str
 
+    log_level: str
+    local_path: str
+
     def __init__(self):
 
         # Required configurations
@@ -55,5 +58,9 @@ def __init__(self):
         self.rabbitmq_exchange = os.getenv("RABBITMQ_EVENT_BUS_EXCHANGE", "")
         self.rabbitmq_result_routing_key = os.getenv("RABBITMQ_RESULT_ROUTING_KEY", "")
 
+        self.local_path = os.getenv("LOCAL_PATH", "./")
+        self.log_level = os.getenv("LOG_LEVEL", "INFO")
+        assert self.log_level in ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+
 
 env = Env()

alkemio_virtual_contributor_engine/rabbitmq.py

@@ -5,7 +5,7 @@
 import aiormq
 
 from alkemio_virtual_contributor_engine.config import env
-from logger import setup_logger
+from alkemio_virtual_contributor_engine.setup_logger import setup_logger
 
 logger = setup_logger(__name__)
 

alkemio_virtual_contributor_engine/setup_logger.py

@@ -0,0 +1,39 @@
+import logging
+import sys
+import io
+import os
+from config import env
+
+
+def setup_logger(name):
+    logger = logging.getLogger(name)
+    logger.setLevel(env.log_level)
+
+    c_handler = logging.StreamHandler(
+        io.TextIOWrapper(sys.stdout.buffer, line_buffering=True)
+    )
+    f_handler = logging.FileHandler(
+        os.path.join(os.path.expanduser(env.local_path), "app.log")
+    )
+
+    c_handler.setLevel(env.log_level)
+    f_handler.setLevel(logging.WARNING)
+
+    c_format = logging.Formatter(
+        '{"time": "%(asctime)s", "name": %(name)r, "level": "%(levelname)s", "message": %(message)r}',
+        "%m-%d %H:%M:%S",
+    )
+    f_format = logging.Formatter(
+        '{"time": "%(asctime)s", "name": %(name)r, "level": "%(levelname)s", "message": %(message)r}',
+        "%m-%d %H:%M:%S",
+    )
+
+    c_handler.setFormatter(c_format)
+    f_handler.setFormatter(f_format)
+
+    logger.addHandler(c_handler)
+    logger.addHandler(f_handler)
+
+    logger.info(f"log level {os.path.basename(__file__)}: {env.log_level}")
+
+    return logger

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "alkemio-virtual-contributor-engine"
-version = "0.0.2"
+version = "0.0.3"
 description = "Alkemio's generic Virtual Contributor engine"
 authors = ["Vladimir Aleksiev <vladimir@alkem.io>"]
 readme = "README.md"