diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/initlog.py | 2 | ||||
| -rwxr-xr-x | tools/merge_backup.py | 2 | ||||
| -rwxr-xr-x | tools/merge_dist.py | 2 | ||||
| -rwxr-xr-x | tools/merge_fetch.py | 2 | ||||
| -rw-r--r-- | tools/mergetools.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/initlog.py b/tools/initlog.py index da63206..235bd6a 100755 --- a/tools/initlog.py +++ b/tools/initlog.py @@ -90,7 +90,7 @@ def main(): write_file(minsizefile, minsize) # Create a chains database. - perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") + perm(localconfig["dbbackend"], mergedb + "/chains") return 0 diff --git a/tools/merge_backup.py b/tools/merge_backup.py index e3385d4..17c137f 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -111,7 +111,7 @@ def merge_backup(args, config, localconfig, secondaries): "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) mergedb = paths["db"] - chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") + chainsdb = perm(localconfig["dbbackend"], mergedb + "/chains") logorderfile = mergedb + "/logorder" currentsizefile = mergedb + "/fetched" timing = timing_point() diff --git a/tools/merge_dist.py b/tools/merge_dist.py index c1fdb42..c0e5491 100755 --- a/tools/merge_dist.py +++ b/tools/merge_dist.py @@ -86,7 +86,7 @@ def merge_dist(args, localconfig, frontendnodes, timestamp): "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) mergedb = paths["db"] - chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") + chainsdb = perm(localconfig["dbbackend"], mergedb + "/chains") logorderfile = mergedb + "/logorder" sthfile = mergedb + "/sth" create_ssl_context(cafile=paths["https_cacertfile"]) diff --git a/tools/merge_fetch.py b/tools/merge_fetch.py index bf5a204..6b0a110 100755 --- a/tools/merge_fetch.py +++ b/tools/merge_fetch.py @@ -83,7 +83,7 @@ def merge_fetch(args, config, localconfig, currentsizefile): storagenodes = config["storagenodes"] mergedb = paths["db"] logorderfile = mergedb + "/logorder" - chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") + chainsdb = perm(localconfig["dbbackend"], mergedb + "/chains") own_key = (localconfig["nodename"], "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) diff --git a/tools/mergetools.py b/tools/mergetools.py index 62b11e4..95742dc 100644 --- a/tools/mergetools.py +++ b/tools/mergetools.py @@ -439,7 +439,7 @@ def parse_args(parser=None): return (args, config, localconfig) def perm(dbtype, path): - if dbtype == "filedb": + if dbtype == "fsdb": return FileDB(path) elif dbtype == "permdb": return PermDB(path) |