Change in osmo-gsm-tester[master]: log: Improve log ctx information in log.Error exception
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 ) Change subject: log: Improve log ctx information in log.Error exception .. log: Improve log ctx information in log.Error exception Before, it would show somethig like: """ osmo_gsm_tester.core.log.Error: Exited in error 255 """ Now: """ osmo_gsm_tester.core.log.Error: rm-remote-dir(pid=24820): Exited in error 255 [trial↪4g:srsue-rftype@zmq+srsenb-rftype@zmq+mod-enb-nprb@6↪ping.py:9↪ping.py↪srsepc_10.42.42.118↪host-jenkins@10.42.42.110↪rm-remote-dir(pid=24820)] """ Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d --- M src/osmo_gsm_tester/core/log.py 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/log.py b/src/osmo_gsm_tester/core/log.py index 8ae55d9..2cf1af0 100644 --- a/src/osmo_gsm_tester/core/log.py +++ b/src/osmo_gsm_tester/core/log.py @@ -88,8 +88,17 @@ get_process_id = lambda: '%d-%d' % (os.getpid(), time.time()) class Error(Exception): -def __init__(self, *messages, **named_items): -super().__init__(compose_message(messages, named_items)) +def __init__(self, *messages, origin=None, **named_items): +msg = '' +if origin is None: +origin = Origin.find_on_stack(f=sys._getframe(1)) +if origin: +msg += origin.name() + ': ' +msg += compose_message(messages, named_items) +if origin and origin._parent is not None: +deeper_origins = origin.ancestry_str() +msg += ' [%s]' % deeper_origins +super().__init__(msg) class LogTarget: all_targets = [] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d Gerrit-Change-Number: 18658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: log: Improve log ctx information in log.Error exception
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 ) Change subject: log: Improve log ctx information in log.Error exception .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d Gerrit-Change-Number: 18658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Jun 2020 09:01:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: log: Improve log ctx information in log.Error exception
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 ) Change subject: log: Improve log ctx information in log.Error exception .. log: Improve log ctx information in log.Error exception Before, it would show somethig like: """ osmo_gsm_tester.core.log.Error: Exited in error 255 """ Now: """ osmo_gsm_tester.core.log.Error: rm-remote-dir(pid=24820): Exited in error 255 [trial↪4g:srsue-rftype@zmq+srsenb-rftype@zmq+mod-enb-nprb@6↪ping.py:9↪ping.py↪srsepc_10.42.42.118↪host-jenkins@10.42.42.110↪rm-remote-dir(pid=24820)] """ Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d --- M src/osmo_gsm_tester/core/log.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/18658/1 diff --git a/src/osmo_gsm_tester/core/log.py b/src/osmo_gsm_tester/core/log.py index 8ae55d9..2cf1af0 100644 --- a/src/osmo_gsm_tester/core/log.py +++ b/src/osmo_gsm_tester/core/log.py @@ -88,8 +88,17 @@ get_process_id = lambda: '%d-%d' % (os.getpid(), time.time()) class Error(Exception): -def __init__(self, *messages, **named_items): -super().__init__(compose_message(messages, named_items)) +def __init__(self, *messages, origin=None, **named_items): +msg = '' +if origin is None: +origin = Origin.find_on_stack(f=sys._getframe(1)) +if origin: +msg += origin.name() + ': ' +msg += compose_message(messages, named_items) +if origin and origin._parent is not None: +deeper_origins = origin.ancestry_str() +msg += ' [%s]' % deeper_origins +super().__init__(msg) class LogTarget: all_targets = [] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8873f67a2f3df21c4dd552c92510535bf95e2c9d Gerrit-Change-Number: 18658 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
