commit 1bd2c69fcbb8bf1b59b16e3f6d22066b53ff428c Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Wed Mar 26 05:21:00 2014 +0000

Open and convert the db, if necessary. Store DB filename for all. --- lib/bridgedb/Main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 6c099b8..a28b75f 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -553,9 +553,10 @@ def startup(options): emailDistributorTmp, ipDistributorTmp) = createBridgeRings(cfg, proxyList, key)

- # Initialize our DB file. - db = bridgedb.Storage.Database(cfg.DB_FILE + ".sqlite", cfg.DB_FILE) - bridgedb.Storage.setGlobalDB(db) + # Initialize our DB. + bridgedb.Storage.initializeDBLock() + db = bridgedb.Storage.openOrConvertDatabase(cfg.DB_FILE + ".sqlite", cfg.DB_FILE) + bridgedb.Storage.setDBFilename(cfg.DB_FILE + ".sqlite") load(state, splitter, clear=False)

state = persistent.load()