refactor: allow turn json as option in sm

darklab8 · Jan 30, 2024 · 82d18c6 · 82d18c6
1 parent e079f71
commit 82d18c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "typelog"
-version = "0.2.7"
+version = "0.2.8"
 description = "Static typed structured logging"
 readme = "README.md"
 authors = [{ name = "dd84ai", email = "dark.dreamflyer@gmail.com" }]

diff --git a/typelog/logcore.py b/typelog/logcore.py
@@ -16,8 +16,8 @@ class StructuredMessage:
     def __init__(
         self,
         message: str,
-        turn_json: Optional[bool],
         *args: LogType,
+        turn_json: Optional[bool] = None,
     ) -> None:
         self._message = message
         self._turn_json = turn_json
@@ -56,27 +56,37 @@ def __init__(self, name: str, turn_json: Optional[bool]):
 
     def debug(self, message: str, *args: LogType) -> None:
         self._logger.debug(
-            StructuredMessage(message, self._turn_json, *(args + self._with_fields))
+            StructuredMessage(
+                message, *(args + self._with_fields), turn_json=self._turn_json
+            )
         )
 
     def info(self, message: str, *args: LogType) -> None:
         self._logger.info(
-            StructuredMessage(message, self._turn_json, *(args + self._with_fields))
+            StructuredMessage(
+                message, *(args + self._with_fields), turn_json=self._turn_json
+            )
         )
 
     def warn(self, message: str, *args: LogType) -> None:
         self._logger.warning(
-            StructuredMessage(message, self._turn_json, *(args + self._with_fields))
+            StructuredMessage(
+                message, *(args + self._with_fields), turn_json=self._turn_json
+            )
         )
 
     def error(self, message: str, *args: LogType) -> None:
         self._logger.error(
-            StructuredMessage(message, self._turn_json, *(args + self._with_fields))
+            StructuredMessage(
+                message, *(args + self._with_fields), turn_json=self._turn_json
+            )
         )
 
     def fatal(self, message: str, *args: LogType) -> None:
         self._logger.fatal(
-            StructuredMessage(message, self._turn_json, *(args + self._with_fields))
+            StructuredMessage(
+                message, *(args + self._with_fields), turn_json=self._turn_json
+            )
         )
 
     def with_fields(self, *args: LogType) -> "Typelog":