Merge pull request #68 from freifunkMUC/fix_domain_switch

Replace or create existing route
freifunkMUC · Sep 11, 2021 · 62b8608 · 62b8608
2 parents 7563827 + 3ec0260
commit 62b8608
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/wgkex.yaml.example b/wgkex.yaml.example
@@ -19,7 +19,6 @@ mqtt:
   keepalive: 5
   tls: False
 domain_prefix: myprefix-
-log_level: DEBUG
 logging_config:
     formatters:
       standard:

diff --git a/wgkex/common/logger.py b/wgkex/common/logger.py
@@ -27,7 +27,7 @@
 }
 
 
-def fetch_logging_configuration() -> dict[str, str]:
+def fetch_logging_configuration():
     """Fetches logging configuration from disk, if exists.
 
     If the config exists, then we check to see if the key 'logging_config' is set. If it is, we return this configuration.

diff --git a/wgkex/config/config.py b/wgkex/config/config.py
@@ -66,7 +66,6 @@ class Config:
     domains: List[str]
     mqtt: MQTT
     domain_prefix: str
-    log_level: str
 
     @classmethod
     def from_dict(cls, cfg: Dict[str, str]) -> "Config":
@@ -81,7 +80,6 @@ def from_dict(cls, cfg: Dict[str, str]) -> "Config":
             domains=cfg["domains"],
             mqtt=mqtt_cfg,
             domain_prefix=cfg["domain_prefix"],
-            log_level=cfg["log_level"],
         )
 
 

diff --git a/wgkex/worker/netlink.py b/wgkex/worker/netlink.py
@@ -167,7 +167,7 @@ def route_handler(client: WireGuardClient) -> Dict:
     # TODO(ruairi): Splice this into an add_ and remove_ function.
     with pyroute2.IPRoute() as ip:
         return ip.route(
-            "del" if client.remove else "add",
+            "del" if client.remove else "replace",
             dst=client.lladdr,
             oif=ip.link_lookup(ifname=client.wg_interface)[0],
         )