From 3051db8a7abf8d95f3e00064ac6c12c3822787cb Mon Sep 17 00:00:00 2001 From: emdee Date: Sun, 10 Dec 2023 22:11:09 +0000 Subject: [PATCH] bugfix --- tox_profile.py | 14 +++++++------- tox_profile_test.bash | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tox_profile.py b/tox_profile.py index 9a0948d..dc92d2f 100644 --- a/tox_profile.py +++ b/tox_profile.py @@ -890,16 +890,16 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False): if node["version"] and node["version"] < "1000002013": lErrs += [nth] - LOG.error(f"vulnerable version {node['version']} < 1000002013") + LOG.error(f"{node['ipv4']}: vulnerable version {node['version']} < 1000002013") elif node["version"] and node["version"] < sVER_MIN: - LOG.warn(f"outdated version {node['version']} < {sVER_MIN}") + LOG.warn(f"{node['ipv4']}: outdated version {node['version']} < {sVER_MIN}") # Put the onion address in the location after the country code if len(node["location"]) not in [2, 65]: - LOG.warn(f"location {node['location']} should be a 2 digit country code, or 'code onion'") + LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code, or 'code onion'") elif len(node["location"]) == 65 and \ not node["location"].endswith('.onion'): - LOG.warn(f"location {node['location']} should be a 2 digit country code 'code onion'") + LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code 'code onion'") elif len(node["location"]) == 65 and \ node["location"].endswith('.onion') and bHAVE_TOR: onion = node["location"][3:] @@ -918,12 +918,12 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False): pass else: if s: - LOG.info(f"Found an onion that resolves to {s}") + LOG.info(f"{node['ipv4']}: Found an onion that resolves to {s}") else: - LOG.warn(f"Found an onion that resolves to {s}") + LOG.warn(f"{node['ipv4']}: Found an onion that resolves to {s}") if node['last_ping'] and time.time() - node['last_ping'] > iOLD_SECS: - LOG.debug(f"node has not been pinged in more than 3 months") + LOG.debug(f"{node['ipv4']}: node has not pinged in more than 3 months") # suggestions YMMV diff --git a/tox_profile_test.bash b/tox_profile_test.bash index 8bb171a..8160fb3 100755 --- a/tox_profile_test.bash +++ b/tox_profile_test.bash @@ -7,10 +7,10 @@ PREFIX=/mnt/o/var/local ROLE=text DEBUG=1 EXE=/var/local/bin/python3.bash -WRAPPER$PREFIX/src/toxygen_wrapper.git +WRAPPER=$PREFIX/src/toxygen_wrapper.git tox=$HOME/.config/tox/toxic_profile.tox [ -s $tox ] || exit 2 -target$PREFIX/src/tox_profile/tox_profile.py +target=$PREFIX/src/tox_profile/tox_profile.py OUT=/tmp/toxic_profile