From: francois Date: Thu, 28 Apr 2011 05:53:12 +0000 (-0700) Subject: munin tahoe_files plugin: fix incorrect file count X-Git-Url: https://git.rkrishnan.org/components/%22news.html/rgr-080307.php?a=commitdiff_plain;h=58af7c8f69f60d379653fcffea16088f9dfe9721;p=tahoe-lafs%2Ftahoe-lafs.git munin tahoe_files plugin: fix incorrect file count fixes #1391 --- diff --git a/misc/operations_helpers/munin/tahoe_files b/misc/operations_helpers/munin/tahoe_files index e68b59da..b6359094 100644 --- a/misc/operations_helpers/munin/tahoe_files +++ b/misc/operations_helpers/munin/tahoe_files @@ -45,8 +45,12 @@ if len(sys.argv) > 1: sys.exit(0) for nodename, basedir in nodedirs: - files = len(os.listdir(os.path.join(basedir, "storage", "shares"))) - if os.path.exists(os.path.join(basedir, "storage", "shares", "incoming")): - files -= 1 # the 'incoming' directory doesn't count - print "%s.value %d" % (nodename, files) + shares = 0 + root = os.path.join(basedir, "storage", "shares") + + for dirpath, dirnames, filenames in os.walk(root, topdown=True): + if dirpath == root and "incoming" in dirnames: + dirnames.remove("incoming") + shares += len(filenames) + print "%s.value %d" % (nodename, shares)