Dedup log initialisation code.

1 files changed, 2 insertions, 7 deletions

diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index ffddc25..d612600 100755
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -18,7 +18,7 @@ from certtools import timing_point, create_ssl_context
 from mergetools import get_curpos, get_logorder, chunks, get_missingentries, \
      publish_sth, sendlog, sendentries, parse_args, perm, \
      get_frontend_verifiedsize, frontend_verify_entries, \
-     waitforfile, flock_ex_or_fail, Status
+     waitforfile, flock_ex_or_fail, Status, loginit
 
 def sendlog_helper(entries, curpos, nodename, nodeaddress, own_key, paths,
                    statusupdates):
@@ -155,12 +155,7 @@ def main():
     lockfile = mergedb + "/.merge_dist.lock"
     timestamp = 0
 
-    loglevel = getattr(logging, args.loglevel.upper())
-    if args.mergeinterval is None:
-        logging.basicConfig(level=loglevel)
-    else:
-        logging.basicConfig(filename=args.logdir + "/merge_dist.log",
-                            level=loglevel)
+    loginit(args, "merge_dist.log")
 
     if not flock_ex_or_fail(lockfile):
         logging.critical("unable to take lock %s", lockfile)