summaryrefslogtreecommitdiff
path: root/tools/merge_sth.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/merge_sth.py')
-rwxr-xr-xtools/merge_sth.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/merge_sth.py b/tools/merge_sth.py
index 97f6e24..9dd7a70 100755
--- a/tools/merge_sth.py
+++ b/tools/merge_sth.py
@@ -15,7 +15,7 @@ import logging
from base64 import b64encode
from datetime import datetime, timedelta
from mergetools import parse_args, get_nfetched, hexencode, hexdecode, \
- get_logorder, get_sth, flock_ex_or_fail
+ get_logorder, get_sth, flock_ex_or_fail, loginit
from certtools import create_ssl_context, get_public_key_from_file, \
timing_point, create_sth_signature, write_file, check_sth_signature, \
build_merkle_tree
@@ -130,12 +130,7 @@ def main():
mergedb = paths["mergedb"]
lockfile = mergedb + "/.merge_sth.lock"
- loglevel = getattr(logging, args.loglevel.upper())
- if args.mergeinterval is None:
- logging.basicConfig(level=loglevel)
- else:
- logging.basicConfig(filename=args.logdir + "/merge_sth.log",
- level=loglevel)
+ loginit(args, "merge_sth.log")
if not flock_ex_or_fail(lockfile):
logging.critical("unable to take lock %s", lockfile)