commit ebc2b2c9ee08ed01877e80e007dd04998303ca93 Author: ana-cc <ana@netstat.org.uk> Date: Tue Feb 19 11:46:10 2019 +0100 Assigns tgen model to variable, formats arguments in a dictionary --- onionperf/measurement.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 508bd2c..0c559d9 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -313,19 +313,28 @@ class Measurement(object): def __start_tgen(self, name, tgen_port, socks_port=None, server_urls=None): logging.info("Starting TGen {0} process on port {1}...".format(name, tgen_port)) - tgen_datadir = "{0}/tgen-{1}".format(self.datadir_path, name) if not os.path.exists(tgen_datadir): os.makedirs(tgen_datadir) tgen_confpath = "{0}/tgen.graphml.xml".format(tgen_datadir) if os.path.exists(tgen_confpath): os.remove(tgen_confpath) + if socks_port is None: model.ListenModel(tgen_port="{0}".format(tgen_port)).dump_to_file(tgen_confpath) logging.info("TGen server running at 0.0.0.0:{0}".format(tgen_port)) - elif self.oneshot: - model.OneshotModel(tgen_port="{0}".format(tgen_port), tgen_servers=server_urls, socksproxy="127.0.0.1:{0}".format(socks_port)).dump_to_file(tgen_confpath) else: - model.TorperfModel(tgen_port="{0}".format(tgen_port), tgen_servers=server_urls, socksproxy="127.0.0.1:{0}".format(socks_port)).dump_to_file(tgen_confpath) + + tgen_model_args = { + tgen_port: "{0}".format(tgen_port), + tgen_servers: server_urls, + socksproxy: "127.0.0.1:{0}".format(socks_port) + } + if self.oneshot: + tgen_model = model.OneshotModel(**tgen_model_args) + else: + tgen_model = model.TorperfModel(**tgen_model_args) + + tgen_model.dump_to_file(tgen_confpath) tgen_logpath = "{0}/onionperf.tgen.log".format(tgen_datadir) tgen_writable = util.FileWritable(tgen_logpath)