From dacad4d519b422f26a881e2ad6ba1858331ffca2 Mon Sep 17 00:00:00 2001 From: Georg Koppen Date: Wed, 22 Jan 2020 08:51:06 +0000 Subject: [PATCH 2/3] Create results directories if they do not exist diff --git a/relay_perf.py b/relay_perf.py index d2ea573..a207e94 100644 --- a/relay_perf.py +++ b/relay_perf.py @@ -11,13 +11,15 @@ from twisted.internet.defer import ensureDeferred from twisted.internet.endpoints import TCP4ClientEndpoint from twisted.internet.task import react -def write_json(filestem, data): +def write_json(filestem, data, relay_type): now = datetime.datetime.now().strftime("%Y%m%d_%H%M"); #print(data) jsonStr = json.dumps(data) - with open(filestem + "_" + now + ".json", "w") as f: + if not os.path.exists(filestem): + os.mkdir(filestem) + with open(filestem + "/" + relay_type + "_" + now + ".json", "w") as f: f.write(jsonStr) - with open(filestem + "_latest.json", "w") as f: + with open(filestem + "/" + relay_type + "_latest.json", "w") as f: f.write(jsonStr) def relay_data(exits): @@ -125,13 +127,13 @@ async def _main(reactor, fingerprint, bareIP): exits = list(filter(lambda router: "exit" in router.flags, routers)) exit_results = await test_relays(reactor, state, socks, [guard1], exits, 10, bareIP) exit_results["_relays"] = relay_data(True) - write_json("../all_exit_results/exit_results", exit_results) + write_json("../all_exit_results", exit_results, "exit") exit_node = state.routers_by_hash["$7BD7B547676257EF147F5D5B7A5B15F840F4B579"] relays = list(filter(lambda router: "exit" not in router.flags, routers)) relay_results = await test_relays(reactor, state, socks, relays, [exit_node], 3, False) relay_results["_relays"] = relay_data(False) - write_json("../all_relay_results/relay_results", relay_results) + write_json("../all_relay_results", relay_results, "non_exit") def main(fingerprint, bareIP): return react( -- 2.25.0