diff --git a/netbox_dns_bridge/__init__.py b/netbox_dns_bridge/__init__.py index a229f08..5bbcfc4 100644 --- a/netbox_dns_bridge/__init__.py +++ b/netbox_dns_bridge/__init__.py @@ -1,12 +1,8 @@ from netbox.plugins import PluginConfig from django.conf import settings -from .logger import get_logger __version__ = "1.5.8" -LOGGER = get_logger(__name__) - - class DNSBridgeConfig(PluginConfig): name = "netbox_dns_bridge" verbose_name = "Netbox DNS Bridge" @@ -21,7 +17,8 @@ class DNSBridgeConfig(PluginConfig): self.settings = settings.PLUGINS_CONFIG.get(self.name, None) if not self.settings: raise RuntimeError( - f"{self.name}: Plugin {self.verbose_name} failed to initialize due to missing settings. Terminating Netbox." + f"{self.name}: Plugin {self.verbose_name} failed to" + " initialize due to missing settings. Terminating Netbox." ) from . import signals diff --git a/netbox_dns_bridge/logger.py b/netbox_dns_bridge/logger.py deleted file mode 100644 index 0d6f314..0000000 --- a/netbox_dns_bridge/logger.py +++ /dev/null @@ -1,12 +0,0 @@ -import logging - -PLUGIN_NAME = "dns-bridge" - - -def get_logger(name: str) -> logging.Logger: - # name = name.replace("_","-").rsplit(".", 1)[-1] - # - # if name.startswith(PLUGIN_NAME): - # return logging.getLogger(name) - # return logging.getLogger(f"{PLUGIN_NAME}.{name}") - return logging.getLogger(f"{PLUGIN_NAME}") diff --git a/netbox_dns_bridge/management/commands/dns-transfer-endpoint.py b/netbox_dns_bridge/management/commands/dns-transfer-endpoint.py index f18fc51..db2f859 100644 --- a/netbox_dns_bridge/management/commands/dns-transfer-endpoint.py +++ b/netbox_dns_bridge/management/commands/dns-transfer-endpoint.py @@ -15,9 +15,9 @@ from django.core.management.base import BaseCommand from django.conf import settings from django.db import OperationalError from netbox_dns.models import View -from netbox_dns_bridge.request_handler import UDPRequestHandler, TCPRequestHandler -from netbox_dns_bridge.dns_server import UDPDNSServer, TCPDNSServer -from netbox_dns_bridge.logger import get_logger +from .dns_transfer_endpoint.request_handler import UDPRequestHandler, TCPRequestHandler +from .dns_transfer_endpoint.dns_server import UDPDNSServer, TCPDNSServer +from netbox_dns_bridge.utils import get_logger LOGGER = get_logger(__name__) SETTINGS = settings.PLUGINS_CONFIG.get("netbox_dns_bridge", {}) diff --git a/netbox_dns_bridge/management/commands/dns_transfer_endpoint/__init__.py b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/netbox_dns_bridge/catalog_zone_manager.py b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/catalog_zone_manager.py similarity index 99% rename from netbox_dns_bridge/catalog_zone_manager.py rename to netbox_dns_bridge/management/commands/dns_transfer_endpoint/catalog_zone_manager.py index 054b4e5..a0efa49 100644 --- a/netbox_dns_bridge/catalog_zone_manager.py +++ b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/catalog_zone_manager.py @@ -2,13 +2,14 @@ import dns.name import dns.zone import dns.rdatatype import dns.rdataclass -from .logger import get_logger +from netbox_dns_bridge.utils import get_logger from netbox_dns.models import Zone as NBZone from netbox_dns_bridge.models import IntegerKeyValueSetting, CatalogZoneMemberIdentifier from uuid import uuid4 from base64 import b32encode from django.db import transaction, close_old_connections, OperationalError + LOGGER = get_logger(__name__) diff --git a/netbox_dns_bridge/dns_server.py b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/dns_server.py similarity index 96% rename from netbox_dns_bridge/dns_server.py rename to netbox_dns_bridge/management/commands/dns_transfer_endpoint/dns_server.py index 802a814..0a0fb27 100644 --- a/netbox_dns_bridge/dns_server.py +++ b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/dns_server.py @@ -1,6 +1,6 @@ import socketserver import socket -from .logger import get_logger +from netbox_dns_bridge.utils import get_logger LOGGER = get_logger(__name__) diff --git a/netbox_dns_bridge/request_handler.py b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/request_handler.py similarity index 98% rename from netbox_dns_bridge/request_handler.py rename to netbox_dns_bridge/management/commands/dns_transfer_endpoint/request_handler.py index a456b81..d38b0f1 100644 --- a/netbox_dns_bridge/request_handler.py +++ b/netbox_dns_bridge/management/commands/dns_transfer_endpoint/request_handler.py @@ -10,17 +10,16 @@ import dns.rdataclass import dns.rdtypes import dns.exception import dns.renderer -from .logger import get_logger from django.utils import timezone from django.db import close_old_connections, OperationalError from django.conf import settings -from netbox_dns.models import Zone, Record, View -from netbox_dns_bridge import catalog_zone_manager as catzm -from .models import SeenTransferClients -from .utils import build_dns_zone +from netbox_dns.models import Zone, View +from . import catalog_zone_manager as catzm +from netbox_dns_bridge.models import SeenTransferClients +from netbox_dns_bridge.utils import build_dns_zone, get_logger LOGGER = get_logger(__name__) -SETTINGS = settings.PLUGINS_CONFIG["netbox_dns_bridge"] +SETTINGS = settings.PLUGINS_CONFIG.get("netbox_dns_bridge", {}) class DNSBaseRequestHandler(socketserver.BaseRequestHandler): diff --git a/netbox_dns_bridge/signals/netbox_dns_zones.py b/netbox_dns_bridge/signals/netbox_dns_zones.py index 999173b..bf8b1c2 100644 --- a/netbox_dns_bridge/signals/netbox_dns_zones.py +++ b/netbox_dns_bridge/signals/netbox_dns_zones.py @@ -4,11 +4,10 @@ from django.db import transaction from django.conf import settings from netbox.context import current_request from netbox_dns.models import Zone -from netbox_dns_bridge import catalog_zone_manager as catzm -from netbox_dns_bridge import notify_handler - -SETTINGS = settings.PLUGINS_CONFIG["netbox_dns_bridge"] +from netbox_dns_bridge.management.commands.dns_transfer_endpoint import catalog_zone_manager as catzm +from . import notify_handler +SETTINGS = settings.PLUGINS_CONFIG.get("netbox_dns_bridge", {}) @receiver(pre_save, sender=Zone) def zone_pre_save(sender, instance, **kwargs): diff --git a/netbox_dns_bridge/notify_handler.py b/netbox_dns_bridge/signals/notify_handler.py similarity index 97% rename from netbox_dns_bridge/notify_handler.py rename to netbox_dns_bridge/signals/notify_handler.py index 60b625a..c0ebbe4 100644 --- a/netbox_dns_bridge/notify_handler.py +++ b/netbox_dns_bridge/signals/notify_handler.py @@ -11,12 +11,11 @@ from django.utils import timezone from django.db import close_old_connections, OperationalError from netbox.jobs import JobRunner from netbox_dns.models import View, Zone, Record -from .logger import get_logger -from .models import SeenTransferClients, IntegerKeyValueSetting +from netbox_dns_bridge.utils import get_logger +from netbox_dns_bridge.models import SeenTransferClients, IntegerKeyValueSetting LOGGER = get_logger(__name__) -SETTINGS = settings.PLUGINS_CONFIG["netbox_dns_bridge"] - +SETTINGS = settings.PLUGINS_CONFIG.get("netbox_dns_bridge", {}) def _load_tsig_key(view_name: str) -> dns.tsig.Key: tsig_keys = SETTINGS.get("tsig_keys", {}) diff --git a/netbox_dns_bridge/utils.py b/netbox_dns_bridge/utils.py index 753d130..d12a075 100644 --- a/netbox_dns_bridge/utils.py +++ b/netbox_dns_bridge/utils.py @@ -4,7 +4,12 @@ import dns.rdatatype import dns.rdataclass import dns.rdataset import netbox_dns.models -from .logger import get_logger +import logging + + +def get_logger(name: str) -> logging.Logger: + return logging.getLogger("dns-bridge") + LOGGER = get_logger(__name__)