Merge pull request #17 from Alsheh/logging-formatters-local

Fixing an issue where numbers are considered valid JSON by the praser
Alsheh · May 5, 2021 · b623852 · b623852
2 parents 2a50bb3 + 5736268
commit b623852
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/supervisor/loggers.py b/supervisor/loggers.py
@@ -194,8 +194,15 @@ def format(self, record):
         else:
             message = record.getMessage()
             try:
-                message_dict = json.loads(message)
-                record.message = None
+                json_message = json.loads(message)
+                # The json parser accepts numbers as a valid json.
+                # But we want json objects only.
+                if isinstance(json_message, dict):
+                    message_dict = json_message
+                    record.message = None
+                else:
+                    del json_message
+                    record.message = as_string(message).rstrip('\n')
             except json.decoder.JSONDecodeError:
                 record.message = as_string(message).rstrip('\n')