From 58af7c8f69f60d379653fcffea16088f9dfe9721 Mon Sep 17 00:00:00 2001 From: francois Date: Wed, 27 Apr 2011 22:53:12 -0700 Subject: [PATCH] munin tahoe_files plugin: fix incorrect file count fixes #1391 --- misc/operations_helpers/munin/tahoe_files | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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) -- 2.37.2