Move logging functions from util.py to a new lib/log.py #81
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good, however: "We can’t automatically merge this pull request. |
This (finally) fully solves the circular import problem: $ for i in lib.util lib.thread lib.log lib.zookeeper external.stacktracer; do python3 -c "import $i"; done $
|
Fixed the merge now. |
pszal
added a commit
that referenced
this pull request
Apr 27, 2015
Move logging functions from util.py to a new lib/log.py
FR4NK-W
pushed a commit
to FR4NK-W/osourced-scion
that referenced
this pull request
Feb 14, 2017
Move logging functions from util.py to a new lib/log.py
FR4NK-W
pushed a commit
to FR4NK-W/osourced-scion
that referenced
this pull request
Aug 28, 2020
* [webapp] Add Multi-Path Colors & bug fixes - Adds deterministic colors for each unique path. - Adds path colors to path selection list. - Adds/changes path colors to bwtest and echo graph data points. - Adds path # hops as a badge next to path selection list. - Adds gray color for graph data points without matching paths. - Changes to faint-red color for graph error data points, not red. - Fixes bwtest failure to match interactive paths due to ANSI escapes. - Fixes bwtest failure to match default path. - Improves regex cases to record echo errors. - Adds stderr to command parsing stream with stdout. - Fixes overlapping continuous switch conditions between user-server. - Fixes scionproto#69. * removed erroneous html
mawyss
pushed a commit
to mawyss/scion
that referenced
this pull request
Jan 19, 2021
* fix Level 1 key Exchange: - Add sanity check in the drkey_fetcher which validates that the response srcIA matches the intended server IA. * refactor cs/drkey_fetcher and add test case
juagargi
added a commit
to juagargi/scion
that referenced
this pull request
Oct 5, 2021
Squashed changes for DRKey, ported to latest upstream master branch. This includes the following main commits: * 707a5e6 DRKey ported from the old SCIONLab (scionproto#77) This is itself a squashed commit containing the bulk of the newly added DRKey implementation. * 5a623a2 Allow a second call to initQUICSockets. (scionproto#79) * df3a258 unify personal annotations to JordiSubira (scionproto#80) * 9380c76 fix Level 1 key Exchange (scionproto#81) Add sanity check in the drkey_fetcher which validates that the response srcIA matches the intended server IA. * a90f354 Remove redundant fields from Lvl1Req/Resp (scionproto#83) * 64f4c23 cs/drkey: handle situations where no path to a peer AS can be found (scionproto#90) This condition is now handled analog to a similar condition in github.com/scionproto/scion/go/pkg/trust.AuthRouter.ChooseServer The main change applied to make this compatible with the master branch was to resolve the renaming / moving of what was previously pkg/sciond to now pkg/daemon. Co-authored-by: JordiSubira <jordi.subira.nieto@gmail.com> Co-authored-by: Juan A. Garcia Pardo <juagargi@gmail.com>
jiceatscion
added a commit
to jiceatscion/scion
that referenced
this pull request
Oct 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This (finally) fully solves the circular import problem:
$ for i in lib.util lib.thread lib.log lib.zookeeper external.stacktracer; do python3 -c "import $i"; done
$
Compare this with what happens now unless you're very careful about which order you import libraries:
$ for i in lib.util lib.thread lib.zookeeper external.stacktracer; do python3 -c "import $i"; done
Traceback (most recent call last):
File "", line 1, in
File "/home/kormat/github/scion/lib/thread.py", line 25, in
import lib.util
File "/home/kormat/github/scion/lib/util.py", line 27, in
from external.stacktracer import trace_start
File "/home/kormat/github/scion/external/stacktracer.py", line 21, in
from lib.thread import thread_safety_net
ImportError: cannot import name 'thread_safety_net'
Traceback (most recent call last):
File "", line 1, in
File "/home/kormat/github/scion/lib/zookeeper.py", line 28, in
from lib.thread import (kill_self, thread_safety_net)
File "/home/kormat/github/scion/lib/thread.py", line 25, in
import lib.util
File "/home/kormat/github/scion/lib/util.py", line 27, in
from external.stacktracer import trace_start
File "/home/kormat/github/scion/external/stacktracer.py", line 21, in
from lib.thread import thread_safety_net
ImportError: cannot import name 'thread_safety_net'
Traceback (most recent call last):
File "", line 1, in
File "/home/kormat/github/scion/external/stacktracer.py", line 21, in
from lib.thread import thread_safety_net
File "/home/kormat/github/scion/lib/thread.py", line 25, in
import lib.util
File "/home/kormat/github/scion/lib/util.py", line 27, in
from external.stacktracer import trace_start
ImportError: cannot import name 'trace_start'
$