Make timing printouts optional in merge.py

1 files changed, 5 insertions, 2 deletions

diff --git a/tools/merge.py b/tools/merge.py
index 1b94581..dd8de07 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -26,6 +26,7 @@ parser.add_argument("--signing", metavar="url", help="Base URL for signing serve
 parser.add_argument("--own-keyname", metavar="keyname", help="The key name of the merge node", required=True)
 parser.add_argument("--own-keyfile", metavar="keyfile", help="The file containing the private key of the merge node", required=True)
 parser.add_argument("--nomerge", action='store_true', help="Don't actually do merge")
+parser.add_argument("--timing", action='store_true', help="Print timing information")
 args = parser.parse_args()
 
 ctbaseurl = args.baseurl
@@ -244,7 +245,8 @@ check_sth_signature(ctbaseurl, sth)
 
 timing_point(timing, "build sth")
 
-print timing["deltatimes"]
+if args.timing:
+    print timing["deltatimes"]
 
 print "root hash", base64.b16encode(root_hash)
 
@@ -280,4 +282,5 @@ for frontendnode in frontendnodes:
         print "send sth:", sendsthresult
         sys.exit(1)
     timing_point(timing, "send sth")
-    print timing["deltatimes"]
+    if args.timing:
+        print timing["deltatimes"]