class name DlsLogformatter

DiamondLightSource · Jan 30, 2023 · 5f41de4 · 5f41de4
1 parent 2db3ba4
commit 5f41de4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -211,4 +211,5 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_TOKEN }}
-# dae_devops_fingerprint 1b72ff6e4b0c936023ed359bbc305357
+
+# dae_devops_fingerprint c2f0c84505f9471a61bdd69831c77baf
diff --git a/src/dls_mainiac_lib/log666.py b/src/dls_mainiac_lib/log666.py
@@ -6,7 +6,7 @@
 import threading
 
 # Log formatter.
-from dls_logformatter.dls_logformatter import DlsLogform
+from dls_logformatter.dls_logformatter import DlsLogformatter
 
 
 # -------------------------------------------------------------------------
@@ -58,7 +58,7 @@ def start_logfile(program_name, settings):
         )
 
         # Let logging write custom formatted messages to stdout.
-        logfile_handler.setFormatter(DlsLogform())
+        logfile_handler.setFormatter(DlsLogformatter())
         logging.getLogger().addHandler(logfile_handler)
 
         return logfile_handler
diff --git a/src/dls_mainiac_lib/mainiac.py b/src/dls_mainiac_lib/mainiac.py
@@ -15,7 +15,7 @@
 from string import Template
 
 # Log formatter.
-from dls_logformatter.dls_logformatter import DlsLogform
+from dls_logformatter.dls_logformatter import DlsLogformatter
 from dls_logformatter.functions import format_exception_causes
 
 # Rotating log file.
@@ -383,12 +383,12 @@ def configure_logging(self, settings=None):
 
                 if console_verbose:
                     # Let logging write custom formatted messages to stdout, long format.
-                    formatter = DlsLogform()
+                    formatter = DlsLogformatter()
                     console_handler.setFormatter(formatter)
                     # Log level for the console, verbose
                     console_handler.setLevel(logging.DEBUG)
                 else:
-                    formatter = DlsLogform(type="bare")
+                    formatter = DlsLogformatter(type="bare")
                     console_handler.setFormatter(formatter)
                     # Log level for the console, not verbose.
                     console_handler.setLevel(logging.INFO)
@@ -442,7 +442,7 @@ def configure_logging(self, settings=None):
                     host, port, debugging_fields=False
                 )
                 # We want "format" of separate indices for the database.
-                graypy_handler.setFormatter(DlsLogform(type="dls"))
+                graypy_handler.setFormatter(DlsLogformatter(type="dls"))
                 graypy_handler.setLevel(logging.DEBUG)
                 logging.getLogger().addHandler(graypy_handler)
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,7 +6,7 @@
 import pytest
 
 # Formatting of testing log messages.
-from dls_logformatter.dls_logformatter import DlsLogform
+from dls_logformatter.dls_logformatter import DlsLogformatter
 
 # Version of the package.
 from dls_mainiac_lib.version import meta as version_meta
@@ -39,7 +39,7 @@ def constants(request):
 @pytest.fixture()
 def logging_setup():
 
-    formatter = DlsLogform(type="long")
+    formatter = DlsLogformatter(type="long")
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)
     logging.getLogger().addHandler(handler)