Merge pull request #61 from freifunkMUC/log_level

 Add configurable log_level

.github/workflows/bazel.yml

@@ -13,4 +13,4 @@ jobs:
           key: bazel
       - uses: actions/checkout@v2
       - name: Run Bazel tests
-        run: bazel test ...:all --test_output=all
+        run: bazel test ...:all --test_output=all --action_env=WGKEX_CONFIG_FILE=`pwd`/wgkex.yaml.example

wgkex.yaml.example

@@ -18,4 +18,5 @@ mqtt:
   password: SECRET
   keepalive: 5
   tls: False
-domain_prefix: myprefix-
+domain_prefix: myprefix-
+log_level: DEBUG

wgkex/broker/app.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import re
 import dataclasses
+import logging
 from typing import Tuple, Any
 
 from flask import Flask
@@ -14,6 +15,11 @@
 
 from wgkex.config import config
 
+logging.basicConfig(
+    format="%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s",
+    datefmt="%Y-%m-%d:%H:%M:%S",
+    level=config.load_config().get("log_level"),
+)
 
 WG_PUBKEY_PATTERN = re.compile(r"^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=$")
 
@@ -88,7 +94,7 @@ def wg_key_exchange() -> Tuple[str, int]:
     domain = data.domain
     # in case we want to decide here later we want to publish it only to dedicated gateways
     gateway = "all"
-    print(f"wg_key_exchange: Domain: {domain}, Key:{key}")
+    logging.info(f"wg_key_exchange: Domain: {domain}, Key:{key}")
 
     mqtt.publish(f"wireguard/{domain}/{gateway}", key)
     return jsonify({"Message": "OK"}), 200
@@ -100,7 +106,7 @@ def handle_mqtt_connect(
 ) -> None:
     """Prints status of connect message."""
     # TODO(ruairi): Clarify current usage of this function.
-    print(
+    logging.debug(
         "MQTT connected to {}:{}".format(
             app.config["MQTT_BROKER_URL"], app.config["MQTT_BROKER_PORT"]
         )
@@ -114,7 +120,9 @@ def handle_mqtt_message(
 ) -> None:
     """Prints message contents."""
     # TODO(ruairi): Clarify current usage of this function.
-    print(f"MQTT message received on {message.topic}: {message.payload.decode()}")
+    logging.debug(
+        f"MQTT message received on {message.topic}: {message.payload.decode()}"
+    )
 
 
 def is_valid_wg_pubkey(pubkey: str) -> str:

wgkex/config/config.py

@@ -72,6 +72,7 @@ class Config:
     domains: List[str]
     mqtt: MQTT
     domain_prefix: str
+    log_level: str
 
     @classmethod
     def from_dict(cls, cfg: Dict[str, str]) -> "Config":
@@ -83,7 +84,10 @@ def from_dict(cls, cfg: Dict[str, str]) -> "Config":
         """
         mqtt_cfg = MQTT.from_dict(cfg["mqtt"])
         return cls(
-            domains=cfg["domains"], mqtt=mqtt_cfg, domain_prefix=cfg["domain_prefix"]
+            domains=cfg["domains"],
+            mqtt=mqtt_cfg,
+            domain_prefix=cfg["domain_prefix"],
+            log_level=cfg["log_level"],
         )
 
 

wgkex/config/config_test.py

@@ -3,7 +3,7 @@
 import config
 import yaml
 
-_VALID_CFG = "domain_prefix: ffmuc_\ndomains:\n- a\n- b\nmqtt:\n  broker_port: 1883\n  broker_url: mqtt://broker\n  keepalive: 5\n  password: pass\n  tls: true\n  username: user\n"
+_VALID_CFG = "domain_prefix: ffmuc_\nlog_level: DEBUG\ndomains:\n- a\n- b\nmqtt:\n  broker_port: 1883\n  broker_url: mqtt://broker\n  keepalive: 5\n  password: pass\n  tls: true\n  username: user\n"
 _INVALID_LINT = "domain_prefix: ffmuc_\nBAD_KEY_FOR_DOMAIN:\n- a\n- b\nmqtt:\n  broker_port: 1883\n  broker_url: mqtt://broker\n  keepalive: 5\n  password: pass\n  tls: true\n  username: user\n"
 _INVALID_CFG = "asdasdasdasd"
 

wgkex/worker/app.py

@@ -12,7 +12,7 @@
 logging.basicConfig(
     format="%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s",
     datefmt="%Y-%m-%d:%H:%M:%S",
-    level=logging.DEBUG,
+    level=config.load_config().get("log_level"),
 )
 
 _CLEANUP_TIME = 300

wgkex/worker/mqtt.py

@@ -15,7 +15,7 @@
 logging.basicConfig(
     format="%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s",
     datefmt="%Y-%m-%d:%H:%M:%S",
-    level=logging.DEBUG,
+    level=load_config().get("log_level"),
 )