wsgi debug

adapt init collector test

InventoryBuilder.py

@@ -84,8 +84,8 @@ def token():
             return json.dumps(self.target_tokens)
 
         try:
-            if logger.level in range(1, 20):
-                # WSGi is logging on INFO Level
+            if logger.level == 10:
+                # WSGi is logging on DEBUG Level
                 WSGIServer((self.wsgi_address, self.port), app).serve_forever()
             else:
                 WSGIServer((self.wsgi_address, self.port), app, log=None).serve_forever()

exporter.py

@@ -89,23 +89,19 @@ def run_prometheus_server(port, collectors, *args):
         time.sleep(1)
 
 
-def initialize_collector_by_name(class_name, test=False):
+def initialize_collector_by_name(class_name, logger):
     try:
         class_module = importlib.import_module(f'collectors.{class_name}')
     except ModuleNotFoundError as e:
-        if test:
-            print('No Collector "BogusCollector" defined. Ignoring...')
-        else:
-            log.error(f'No Collector {class_name} defined. {e}')
+        print('No Collector "BogusCollector" defined. Ignoring...')
+        logger.error(f'No Collector {class_name} defined. {e}')
         return None
 
     try:
         return class_module.__getattribute__(class_name)()
     except AttributeError as e:
-        if test:
-            print('Unable to initialize "ClassNotDefinedCollector". Ignoring...')
-        else:
-            log.error(f'Unable to initialize {class_name}. {e}')
+        print('Unable to initialize "ClassNotDefinedCollector". Ignoring...')
+        logger.error(f'Unable to initialize {class_name}. {e}')
         return None
 
 
@@ -118,5 +114,5 @@ def get_targets():
 if __name__ == '__main__':
     log = logging.getLogger('vrops-exporter')
     options = parse_params(log)
-    collectors = list(map(lambda c: initialize_collector_by_name(c), options.collectors))
+    collectors = list(map(lambda c: initialize_collector_by_name(c, log), options.collectors))
     run_prometheus_server(int(os.environ['PORT']), collectors)

tests/TestCollectorInit.py

@@ -9,6 +9,8 @@
 import collectors.VMStatsCollector
 from exporter import initialize_collector_by_name
 
+logger = logging.getLogger('test-logger')
+
 
 class TestCollectorInitialization(TestCase):
     os.environ.setdefault('TARGET', 'testhost.test')
@@ -18,19 +20,19 @@ class TestCollectorInitialization(TestCase):
     @patch('BaseCollector.BaseCollector.wait_for_inventory_data')
     def test_valid_collector2(self, mocked_wait):
         mocked_wait.return_value = None
-        collector = initialize_collector_by_name('VMStatsCollector', test=True)
+        collector = initialize_collector_by_name('VMStatsCollector', logger)
         self.assertIsInstance(collector, collectors.VMStatsCollector.VMStatsCollector)
 
     @patch('builtins.print')
     def test_with_bogus_collector(self, mocked_print):
-        collector = initialize_collector_by_name('BogusCollector', test=True)
+        collector = initialize_collector_by_name('BogusCollector', logger)
         self.assertIsNone(collector)
         self.assertEqual(mocked_print.mock_calls, [call('No Collector "BogusCollector" defined. Ignoring...')])
 
     @patch('builtins.print')
     def test_with_invalid_collector(self, mocked_print):
         importlib.import_module = MagicMock(return_value=collectors.VMStatsCollector)
-        collector = initialize_collector_by_name('ClassNotDefinedCollector', test=True)
+        collector = initialize_collector_by_name('ClassNotDefinedCollector', logger)
         self.assertIsNone(collector)
         self.assertEqual(mocked_print.mock_calls, [call('Unable to initialize "ClassNotDefinedCollector". Ignoring...')])