Set logger name and catch it properly.

terjekv · Nov 29, 2023 · e3311c3 · e3311c3
1 parent 3028826
commit e3311c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mreg/api/v1/history.py b/mreg/api/v1/history.py
@@ -11,7 +11,7 @@
 
 from mreg.models.base import History
 
-log = structlog.get_logger(__name__)
+log = structlog.get_logger("mreg.history")
 
 
 class DjangoJSONModelEncoder(DjangoJSONEncoder):
@@ -59,8 +59,8 @@ def save_log(self, action, serializer, data, orig_data=None):
 
         try:
             history.full_clean()
-        except ValidationError as e:
-            log.exception("ValidationError", e=e, exc_info=True)
+        except ValidationError:
+            log.exception("ValidationError occured during full_clean()", exc_info=True)
             return
         history.save()
 
@@ -101,8 +101,8 @@ def save_log_m2m_alteration(self, method, instance):
 
         try:
             history.full_clean()
-        except ValidationError as e:
-            log.exception("ValidationError", e=e, exc_info=True)
+        except ValidationError:
+            log.exception("ValidationError occured during full_clean()", exc_info=True)
             return
         history.save()
 

diff --git a/mreg/api/v1/tests/test_history.py b/mreg/api/v1/tests/test_history.py
@@ -36,12 +36,12 @@ def test_save_log_handles_validation_error(self, mock_get_jsondata, mock_manipul
         # Mocking a method for save_log_m2m_alteration method
         method = mock.Mock(__name__='TestMethod')
 
-        with self.assertLogs('dl_logger', level='ERROR') as cm:
+        with self.assertLogs('mreg.history', level='ERROR') as cm:
             log.save_log('test_action', mock_serializer, data)
             log.save_log_m2m_alteration(method, instance)
 
         self.assertEqual(mock_full_clean.call_count, 2)
 
         # Assert that the error was logged twice, with tracebacks.
-        self.assertTrue(cm.output[0].startswith('ERROR:dl_logger:Traceback'))
-        self.assertTrue(cm.output[1].startswith('ERROR:dl_logger:Traceback'))
+        self.assertTrue(cm.output[0].startswith('ERROR:mreg.history:'))
+        self.assertTrue(cm.output[1].startswith('ERROR:mreg.history:'))