commit a79d154de5db6293321f6c68835e8f4ff25032d8 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Fri Mar 28 00:15:16 2014 +0000

Only update distributor's hashring if it's still active

TODO: shutdown the distributor in this situation --- lib/bridgedb/Main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

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

if inThread: - reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) - reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) + if ipDistributorTmp: + reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) + if emailDistributorTmp: + reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) else: # We're still starting up. Return these distributors so # they are configured in the outer-namespace