diff --git a/relaystatus.py b/relaystatus.py index 6bb1fa4..c5cdc19 100644 --- a/relaystatus.py +++ b/relaystatus.py @@ -20,10 +20,13 @@ newVersions = 0 for new_relay in relays: if datetime.datetime.strptime(new_relay["first_seen"], "%Y-%m-%d %H:%M:%S") > (datetime.datetime.utcnow() - datetime.timedelta(hours=1)): exit = "no" + eol = "no" + if not re.search("0.3.5|0.4.5|0.4.6|0.4.7", new_relay["platform"), re.IGNORECASE): + eol = "yes" if new_relay["exit_policy"][0] != "reject *:*": exit = "yes" - exitStatus += "New exit: \"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", effective family size: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" - relayStatus += "New relay: \"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", potential exit: " + exit + ", effective family size: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" + exitStatus += "New exit: \"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", EOL: " + eol + ", effective family size: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" + relayStatus += "New relay: \"" + new_relay["nickname"] + "\", fingerprint: " + new_relay["fingerprint"] + ", potential exit: " + exit + ", EOL: " + eol + ", effective family size: " + str(len(new_relay["effective_family"])-1) + "; https://metrics.torproject.org/rs.html#search/" + new_relay["fingerprint"] + "\n" if re.search("0.3.5.17|0.4.5.11", new_relay["platform"], re.IGNORECASE): newVersions += 1