Change in osmo-gsm-tester[master]: log: Fix OriginLoopError generated in log.Error from testenv.poll()

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18781 )

Change subject: log: Fix OriginLoopError generated in log.Error from testenv.poll()
......................................................................

log: Fix OriginLoopError generated in log.Error from testenv.poll()

Change-Id: Iea80d06a30346533e4ecec338b03c72d1f1067ae
---
M src/osmo_gsm_tester/core/log.py
1 file changed, 6 insertions(+), 1 deletion(-)

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 2cf1af0..f1954d1 100644
--- a/src/osmo_gsm_tester/core/log.py
+++ b/src/osmo_gsm_tester/core/log.py
@@ -386,7 +386,12 @@
             f = f.f_back
 
         if (origin is not None) and (log_ctx_obj is not None):
-            log_ctx_obj.highest_ancestor()._set_parent(origin)
+            log_ctx_highest_ancestor = log_ctx_obj.highest_ancestor()
+            # If Both end up in same ancestor it means they are connected to the
+            # same tree, so no need to connect them, we'll use log_ctx_obj
+            # specific path in that case.
+            if log_ctx_highest_ancestor != origin.highest_ancestor():
+                log_ctx_highest_ancestor._set_parent(origin)
             p = log_ctx_obj
             while p:
                 p._set_log_category(origin._log_category)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18781
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: Iea80d06a30346533e4ecec338b03c72d1f1067ae
Gerrit-Change-Number: 18781
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200611/14c4990d/attachment.htm>