From e1cf693b006dccc23c0e5eb4d996a1146cbd542a Mon Sep 17 00:00:00 2001 From: rozhkovdmitrii Date: Fri, 28 Jan 2022 15:00:02 +0500 Subject: [PATCH 1/3] Provide logging context like in json standard --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 97ed96776..e5af07837 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ psycopg2-binary ethereum py-solc-x==1.1.0 flask -git+https://github.com/neonlabsorg/python-logged-groups.git@2.1.2 +git+https://github.com/neonlabsorg/python-logged-groups.git@2.1.3 From 2a27aa080453bb5c2ca1c046d6adabc2b5421e3c Mon Sep 17 00:00:00 2001 From: rozhkovdmitrii Date: Fri, 28 Jan 2022 16:39:09 +0500 Subject: [PATCH 2/3] Provide logging context like in json standard --- proxy/environment.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/environment.py b/proxy/environment.py index ea12cefef..467636d1b 100644 --- a/proxy/environment.py +++ b/proxy/environment.py @@ -1,3 +1,4 @@ +import json import os import subprocess from logged_groups import logged_group, LogMng @@ -94,7 +95,7 @@ def call(self, *args): "--commitment=recent", "--url", SOLANA_URL, f"--evm_loader={EVM_LOADER_ID}", - f"--logging_ctx={ctx}" + f"--logging_ctx={json.dumps(ctx)}" ]\ + (["-vvv"] if LOG_NEON_CLI_DEBUG else [])\ + list(args) From d20d287f46de8e6c46467bd4497a4a27e8baadce Mon Sep 17 00:00:00 2001 From: rozhkovdmitrii Date: Fri, 28 Jan 2022 16:40:02 +0500 Subject: [PATCH 3/3] Provide logging context like in json standard --- proxy/environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/environment.py b/proxy/environment.py index 467636d1b..75059d467 100644 --- a/proxy/environment.py +++ b/proxy/environment.py @@ -90,12 +90,12 @@ def read_sol_account(name) -> Optional[sol_Account]: class neon_cli: def call(self, *args): try: - ctx = str(LogMng.get_logging_context()) + ctx = json.dumps(LogMng.get_logging_context()) cmd = ["neon-cli", "--commitment=recent", "--url", SOLANA_URL, f"--evm_loader={EVM_LOADER_ID}", - f"--logging_ctx={json.dumps(ctx)}" + f"--logging_ctx={ctx}" ]\ + (["-vvv"] if LOG_NEON_CLI_DEBUG else [])\ + list(args)