From c8fda04ce83795824e89735f0d06feba4d1f5626 Mon Sep 17 00:00:00 2001 From: TheNetworkGuy Date: Thu, 12 Jun 2025 11:08:21 +0000 Subject: [PATCH] Fixed config bug and #111 --- modules/config.py | 5 +---- modules/device.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/config.py b/modules/config.py index 586227d..4a44aab 100644 --- a/modules/config.py +++ b/modules/config.py @@ -118,7 +118,4 @@ def load_config_file(config_default, config_file="config.py"): if hasattr(config_module, key): dconf[key] = getattr(config_module, key) return dconf - logger.warning( - "Config file %s not found. Using default config " - "and environment variables.", config_file) - return None + return config_default \ No newline at end of file diff --git a/modules/device.py b/modules/device.py index b6903fe..b8bda3f 100644 --- a/modules/device.py +++ b/modules/device.py @@ -8,10 +8,10 @@ from logging import getLogger from re import search from zabbix_utils import APIRequestError +from pynetbox import RequestError as NetboxRequestError from modules.exceptions import ( InterfaceConfigError, - JournalError, SyncExternalError, SyncInventoryError, TemplateError, @@ -896,7 +896,7 @@ class PhysicalDevice: self.nb_journals.create(journal) self.logger.debug(f"Host {self.name}: Created journal entry in NetBox") return True - except JournalError(e) as e: + except NetboxRequestError as e: self.logger.warning( "Unable to create journal entry for " f"{self.name}: NB returned {e}"