Author: justi9 Date: 2008-12-11 16:47:23 -0500 (Thu, 11 Dec 2008) New Revision: 2986 Modified: mgmt/trunk/mint/bin/mint-bench mgmt/trunk/mint/python/mint/tools.py Log: Delete the brokers we add so that all threads shutdown Modified: mgmt/trunk/mint/bin/mint-bench =================================================================== --- mgmt/trunk/mint/bin/mint-bench 2008-12-11 21:31:27 UTC (rev 2985) +++ mgmt/trunk/mint/bin/mint-bench 2008-12-11 21:47:23 UTC (rev 2986) @@ -8,13 +8,6 @@ MintBenchTool("mint-bench").main() def main(): - root = logging.getLogger("mint") - root.setLevel(logging.WARN) - - h = logging.StreamHandler() - h.setLevel(logging.WARN) - root.addHandler(h) - if "--profile" in sys.argv: sys.argv.remove("--profile") Modified: mgmt/trunk/mint/python/mint/tools.py =================================================================== --- mgmt/trunk/mint/python/mint/tools.py 2008-12-11 21:31:27 UTC (rev 2985) +++ mgmt/trunk/mint/python/mint/tools.py 2008-12-11 21:47:23 UTC (rev 2986) @@ -124,10 +124,12 @@ model.check() model.init() model.start() + + added = list() try: for arg in args[1:]: - model.addBroker(arg) + added.append(model.addBroker(arg)) enq_last = 0 deq_last = 0 @@ -148,4 +150,8 @@ enq_last = enq deq_last = deq finally: + for broker in added: + model.delBroker(broker) + model.stop() +