Moved loger config to stack module

ccie18643 · Sep 15, 2024 · c4447f2 · c4447f2
1 parent 1bd0a0f
commit c4447f2
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 33 deletions.
diff --git a/pytcp/config.py b/pytcp/config.py
@@ -40,34 +40,6 @@
 assert version_info >= (3, 12), "PyTCP requires Python version 3.12 or higher."
 
 
-# Logger configuration - LOG__CHANNEL sets which subsystems of stack log to the
-# console, LOG__DEBUG adds info about class/method caller.
-# Following subsystems are supported:
-# stack, timer, rx-ring, tx-ring, arp-c, nd-c, ether, arp, ip4, ip6, icmp4,
-# icmp6, udp, tcp, socket, tcp-ss, service.
-LOG__CHANNEL = {
-    "stack",
-    #    "timer",
-    "rx-ring",
-    "tx-ring",
-    "arp-c",
-    "nd-c",
-    "ether",
-    "arp",
-    "ip4",
-    "ip6",
-    "icmp4",
-    "icmp6",
-    "udp",
-    "tcp",
-    "socket",
-    "tcp-ss",
-    "dhcp4",
-    "service",
-    "client",
-}
-LOG__DEBUG = False
-
 # IPv6 default Hop Limit value.
 IP6__DEFAULT_HOP_LIMIT = 64
 

diff --git a/pytcp/lib/logger.py b/pytcp/lib/logger.py
@@ -38,7 +38,7 @@
 import inspect
 import time
 
-from pytcp import config
+from pytcp import stack
 
 STYLES = {
     "</>": "\33[0m",
@@ -75,8 +75,8 @@ def log(
     Log message if channel and severity match configured values.
     """
 
-    if channel in config.LOG__CHANNEL:
-        if config.LOG__DEBUG:
+    if channel in stack.LOG__CHANNEL:
+        if stack.LOG__DEBUG:
             frame_info = inspect.stack()[inspect_depth]
             caller_class = frame_info.frame.f_locals["self"].__class__.__name__
             caller_method = frame_info.function

diff --git a/pytcp/stack/__init__.py b/pytcp/stack/__init__.py
@@ -84,6 +84,34 @@
 ICMP6__ND__CACHE__ENTRY_MAX_AGE = 3600
 ICMP6__ND__CACHE__ENTRY_REFRESH_TIME = 300
 
+# Logger configuration - LOG__CHANNEL sets which subsystems of stack log to the
+# console, LOG__DEBUG adds info about class/method caller.
+# Following subsystems are supported:
+# stack, timer, rx-ring, tx-ring, arp-c, nd-c, ether, arp, ip4, ip6, icmp4,
+# icmp6, udp, tcp, socket, tcp-ss, service.
+LOG__CHANNEL = {
+    "stack",
+    #    "timer",
+    "rx-ring",
+    "tx-ring",
+    "arp-c",
+    "nd-c",
+    "ether",
+    "arp",
+    "ip4",
+    "ip6",
+    "icmp4",
+    "icmp6",
+    "udp",
+    "tcp",
+    "socket",
+    "tcp-ss",
+    "dhcp4",
+    "service",
+    "client",
+}
+LOG__DEBUG = False
+
 version_string = "ver 3.0.2"
 github_repository = "https://github.com/ccie18643/PyTCP"
 

diff --git a/pytcp/stack/arp_cache.py b/pytcp/stack/arp_cache.py
@@ -35,9 +35,9 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 import threading
 import time
+from dataclasses import dataclass, field
 
 from net_addr import Ip4Address, MacAddress
 from pytcp import stack

diff --git a/pytcp/stack/nd_cache.py b/pytcp/stack/nd_cache.py
@@ -35,9 +35,9 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 import threading
 import time
+from dataclasses import dataclass, field
 
 from net_addr import Ip6Address, MacAddress
 from pytcp import stack

diff --git a/tests__legacy/integration/packet_flows_rx.py b/tests__legacy/integration/packet_flows_rx.py
@@ -104,6 +104,7 @@ def _patch_config(self) -> None:
         Patch critical config setting for all packet handler modules.
         """
         for attribute, new_value in CONFIG_PATCHES.items():
+            stack.__dict__[attribute] = new_value
             config.__dict__[attribute] = new_value
 
     # Test name format:

diff --git a/tests__legacy/integration/packet_flows_rx_tx.py b/tests__legacy/integration/packet_flows_rx_tx.py
@@ -166,6 +166,7 @@ def _patch_config(self) -> None:
         Patch critical config setting for all packet handler modules.
         """
         for attribute, new_value in CONFIG_PATCHES.items():
+            stack.__dict__[attribute] = new_value
             config.__dict__[attribute] = new_value
 
     # Test name format:

diff --git a/tests__legacy/unit/mock_network.py b/tests__legacy/unit/mock_network.py
@@ -132,6 +132,7 @@ def patch_config(self: TestCase, *, enable_log: bool = False) -> None:
     Patch critical config setting for all packet handler modules.
     """
     for attribute, new_value in CONFIG_PATCHES.items():
+        stack.__dict__[attribute] = new_value
         config.__dict__[attribute] = new_value