Merge branch 'develop' into killaddrindexrs2

CounterpartyXCP · Dec 18, 2024 · 54e1048 · 54e1048
2 parents db0fcb4 + 894d078
commit 54e1048
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/counterparty-core/counterpartycore/lib/log.py b/counterparty-core/counterpartycore/lib/log.py
@@ -136,13 +136,14 @@ class CustomisedJSONFormatter(JSONFormatter):
     def json_record(self, message: str, extra: dict, record: logging.LogRecord) -> dict:
         extra["filename"] = record.filename
         extra["funcName"] = record.funcName
-        extra["levelname"] = record.levelname
         extra["lineno"] = record.lineno
         extra["module"] = record.module
         extra["name"] = record.name
         extra["pathname"] = record.pathname
         extra["process"] = record.process
         extra["processName"] = record.processName
+        extra["levelName"] = record.levelname
+        extra["severity"] = record.levelname
         if hasattr(record, "stack_info"):
             extra["stack_info"] = record.stack_info
         else:

diff --git a/counterparty-core/counterpartycore/server.py b/counterparty-core/counterpartycore/server.py
@@ -733,7 +733,7 @@ def start_all(args):
         if (
             not os.path.exists(config.DATABASE) and args.catch_up == "bootstrap"
         ) or args.catch_up == "bootstrap-always":
-            bootstrap(no_confirm=True, snapshot_url=args.bootstrap_url)
+            bootstrap.bootstrap(no_confirm=True, snapshot_url=args.bootstrap_url)
 
         # Initialise database
         db = database.initialise_db()

diff --git a/release-notes/release-notes-v10.9.0.md b/release-notes/release-notes-v10.9.0.md
@@ -30,6 +30,7 @@
 ## CLI
 
 - Add `--cache-dir` flag
+- Add `severity` field to JSON logs for compatibility
 
 # Credits
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
     ## CLI
     - Add `--cache-dir` flag
+    - Add `severity` field to JSON logs for compatibility
     # Credits
@@ Expand Down @@