commit 8dfcd5d7f77950828d3c95f93417baf7ea70c6b7 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Sun Mar 30 13:36:49 2014 +0000

Add TODO mentioning that we should be able to disable distributors

If we reparse our config and it tells us that a distributor, which is currently running, should be disabled then we should be able to shut it down.

Also wrap long lines. --- lib/bridgedb/Main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 1f7e52d..8a1b650 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -609,10 +609,14 @@ def startup(options): state.save()

if inThread: + # XXX shutdown the distributors if they were previously running + # and should now be disabled if ipDistributorTmp: - reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) + reactor.callFromThread(replaceBridgeRings, + ipDistributor, ipDistributorTmp) if emailDistributorTmp: - reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) + reactor.callFromThread(replaceBridgeRings, + emailDistributor, emailDistributorTmp) else: # We're still starting up. Return these distributors so # they are configured in the outer-namespace