restructured logging

CveXplore/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.11

CveXplore/api/nvd_nist/nvd_nist_api.py

@@ -38,7 +38,7 @@ def __init__(
 
         self.config = Configuration()
 
-        self.logger = logging.getLogger("NvdNistApi")
+        self.logger = logging.getLogger(__name__)
 
         if self.config.NVD_NIST_API_KEY is not None:
             self.api_key = self.config.NVD_NIST_API_KEY
@@ -264,7 +264,7 @@ def retry_policy(info: RetryInfo) -> RetryPolicyStrategy:
     """
     max_retries = 5
     backoff_in_ms = 0.2 * 2**info.fails + random.uniform(0, 1) * 4
-    logger = logging.getLogger("RetryPolicy")
+    logger = logging.getLogger(__name__)
 
     if info.fails != max_retries:
         logger.debug(f"Current backoff: {backoff_in_ms}")
@@ -279,7 +279,7 @@ def retry_policy(info: RetryInfo) -> RetryPolicyStrategy:
 
 class ApiDataIterator(object):
     def __init__(self, api_data: ApiData):
-        self.logger = logging.getLogger("ApiDataIterator")
+        self.logger = logging.getLogger(__name__)
 
         self._page_length = api_data.results_per_page
         self._total_results = api_data.total_results

CveXplore/database/helpers/generic_db.py

@@ -115,7 +115,7 @@ def _field_list(self, doc_id: str) -> list:
             )
         )
 
-    def field_list(self, *doc_ids: str) -> list | dict:
+    def field_list(self, *doc_ids: str) -> list:
         """
         Method to fetch all field names from a specific collection
         """

CveXplore/database/maintenance/DatabaseSchemaChecker.py

@@ -17,7 +17,7 @@ def __init__(self):
 
         self.dbh = database._dbclient["schema"]
 
-        self.logger = logging.getLogger("SchemaChecker")
+        self.logger = logging.getLogger(__name__)
 
     def validate_schema(self):
         try:

CveXplore/database/maintenance/DownloadHandler.py

@@ -66,7 +66,7 @@ def __init__(self, feed_type: str, prefix: str = None):
 
         self.database = database._dbclient
 
-        self.logger = logging.getLogger("DownloadHandler")
+        self.logger = logging.getLogger(__name__)
 
         self.config = Configuration()
 

CveXplore/database/maintenance/IJSONHandler.py

@@ -9,7 +9,7 @@
 
 class IJSONHandler(object):
     def __init__(self):
-        self.logger = logging.getLogger("IJSONHandler")
+        self.logger = logging.getLogger(__name__)
 
     def fetch(self, filename: str, prefix: str):
         x = 0

CveXplore/database/maintenance/LogHandler.py

@@ -30,6 +30,7 @@ class HelperLogger(logging.Logger):
 
     logDict = {
         "version": 1,
+        "disable_existing_loggers": False,
         "formatters": {
             "sysLogFormatter": {
                 "format": "%(asctime)s - %(name)-8s - %(levelname)-8s - %(message)s"
@@ -46,7 +47,13 @@ class HelperLogger(logging.Logger):
                 "formatter": "simpleFormatter",
             }
         },
-        "root": {"level": "DEBUG", "handlers": ["consoleHandler"]},
+        "loggers": {
+            "CveXplore": {
+                "handlers": ["consoleHandler"],
+                "level": "DEBUG",
+                "propagate": True,
+            },
+        },
     }
 
     dictConfig(logDict)

CveXplore/database/maintenance/Sources_process.py

@@ -46,7 +46,7 @@ def __init__(self):
 
         super().__init__(self.feed_type)
 
-        self.logger = logging.getLogger("CPEDownloads")
+        self.logger = logging.getLogger(__name__)
 
     def file_to_queue(self, *args):
         pass
@@ -251,7 +251,7 @@ def __init__(self):
 
         super().__init__(self.feed_type)
 
-        self.logger = logging.getLogger("CVEDownloads")
+        self.logger = logging.getLogger(__name__)
 
     @staticmethod
     def get_cve_year_range():
@@ -892,7 +892,7 @@ def __init__(self):
 
         self.feed_url = Configuration.getFeedURL(self.feed_type.lower())
 
-        self.logger = logging.getLogger("VIADownloads")
+        self.logger = logging.getLogger(__name__)
 
     def file_to_queue(self, file_tuple: Tuple[str, str]):
         working_dir, filename = file_tuple
@@ -976,7 +976,7 @@ def __init__(self):
 
         self.feed_url = Configuration.getFeedURL(self.feed_type.lower())
 
-        self.logger = logging.getLogger("CAPECDownloads")
+        self.logger = logging.getLogger(__name__)
 
         # make parser
         self.parser = make_parser()
@@ -1037,7 +1037,7 @@ def __init__(self):
 
         self.feed_url = Configuration.getFeedURL(self.feed_type.lower())
 
-        self.logger = logging.getLogger("CWEDownloads")
+        self.logger = logging.getLogger(__name__)
 
         # make parser
         self.parser = make_parser()
@@ -1159,7 +1159,7 @@ def __init__(self):
             ],
         }
 
-        self.logger = logging.getLogger("DatabaseIndexer")
+        self.logger = logging.getLogger(__name__)
 
     def getInfo(self, collection: str):
         return sanitize(self.database["info"].find_one({"db": collection}))

CveXplore/database/maintenance/main_updater.py

@@ -22,7 +22,7 @@
 
 class MainUpdater(object):
     """
-    The MainUpdater class is the main class for performing database maintenaince tasks
+    The MainUpdater class is the main class for performing database maintenance tasks
     """
 
     def __init__(self, datasource):
@@ -47,7 +47,7 @@ def __init__(self, datasource):
 
         self.schema_checker = SchemaChecker()
 
-        self.logger = logging.getLogger("MainUpdater")
+        self.logger = logging.getLogger(__name__)
 
     def validate_schema(self):
         return self.schema_checker.validate_schema()