From f3d1659b37351fe2ad958114631f8c1578712e51 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 20 Nov 2015 10:14:04 +0100 Subject: Remove debug printouts from merge programs. --- tools/merge_backup.py | 2 +- tools/merge_fetch.py | 2 +- tools/merge_sth.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/merge_backup.py b/tools/merge_backup.py index 123347a..4fa4225 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -118,7 +118,7 @@ def merge_backup(args, config, localconfig, secondaries): backuppath = mergedb + "/verified." + nodename backupdata = {"tree_size": tree_size, "sha256_root_hash": hexencode(root_hash)} - print >>sys.stderr, "DEBUG: writing to", backuppath, ":", backupdata + #print >>sys.stderr, "DEBUG: writing to", backuppath, ":", backupdata write_file(backuppath, backupdata) if args.timing: diff --git a/tools/merge_fetch.py b/tools/merge_fetch.py index bb1e17e..8a52c9e 100755 --- a/tools/merge_fetch.py +++ b/tools/merge_fetch.py @@ -114,7 +114,7 @@ def main(): while True: logsize, last_hash = merge_fetch(args, config, localconfig) currentsize = {"index": logsize - 1, "hash": hexencode(last_hash)} - print >>sys.stderr, "DEBUG: writing to", currentsizefile, ":", currentsize + #print >>sys.stderr, "DEBUG: writing to", currentsizefile, ":", currentsize write_file(currentsizefile, currentsize) if args.interval is None: break diff --git a/tools/merge_sth.py b/tools/merge_sth.py index 567082c..e8f99d3 100755 --- a/tools/merge_sth.py +++ b/tools/merge_sth.py @@ -45,7 +45,7 @@ def merge_sth(args, config, localconfig): tree = {'tree_size': 0, "sha256_root_hash": ''} trees.append(tree) trees.sort(key=lambda e: e['tree_size'], reverse=True) - print >>sys.stderr, "DEBUG: trees:", trees + #print >>sys.stderr, "DEBUG: trees:", trees if backupquorum > len(trees) - 1: print >>sys.stderr, "backup quorum > number of secondaries:", \ @@ -53,7 +53,7 @@ def merge_sth(args, config, localconfig): return tree_size = trees[backupquorum]['tree_size'] root_hash = hexdecode(trees[backupquorum]['sha256_root_hash']) - print >>sys.stderr, "DEBUG: tree size candidate at backupquorum", \ + #print >>sys.stderr, "DEBUG: tree size candidate at backupquorum", \ backupquorum, ":", tree_size cur_sth = get_sth(sthfile) -- cgit v1.1