[tor-commits] [bridgedb/master] Refactor log messages.

phw at torproject.org phw at torproject.org
Wed Feb 19 18:26:37 UTC 2020


commit b170b03a3a7909a93b764c8c8c69ec4b843d0c2e
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Jan 14 09:06:02 2020 +0100

    Refactor log messages.
    
    These log messages were misleading because they were called from an
    incorrect place in the code.
---
 bridgedb/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bridgedb/main.py b/bridgedb/main.py
index 7c2df6d..7776750 100644
--- a/bridgedb/main.py
+++ b/bridgedb/main.py
@@ -423,17 +423,17 @@ def run(options, reactor=reactor):
         logging.info("Reloading decoy bridges...")
         antibot.loadDecoyBridges(config.DECOY_BRIDGES_FILE)
 
-        logging.info("Reparsing bridge descriptors...")
         (hashring,
          emailDistributorTmp,
          ipDistributorTmp,
          moatDistributorTmp) = createBridgeRings(cfg, proxies, key)
-        logging.info("Bridges loaded: %d" % len(hashring))
 
         # Initialize our DB.
         bridgedb.Storage.initializeDBLock()
         bridgedb.Storage.setDBFilename(cfg.DB_FILE + ".sqlite")
+        logging.info("Reparsing bridge descriptors...")
         load(state, hashring, clear=False)
+        logging.info("Bridges loaded: %d" % len(hashring))
 
         if emailDistributorTmp is not None:
             emailDistributorTmp.prepopulateRings() # create default rings





More information about the tor-commits mailing list