summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smoogen <smooge@redhat.com>2015-04-29 20:33:44 +0000
committerStephen Smoogen <smooge@redhat.com>2015-04-29 20:33:44 +0000
commit0b47bc5948fe16e2d3ba07c93e816852a8cb6f0e (patch)
tree7c49a7cadd6ad07051f9eb8e88192b0c67aa3bd1
parent2e6b1bd082796ee9614cefb194714ce3d769c7fc (diff)
parent21a1715624172914ac412b8cb2bd27f18ddfd43c (diff)
downloadansible-0b47bc5948fe16e2d3ba07c93e816852a8cb6f0e.tar.gz
ansible-0b47bc5948fe16e2d3ba07c93e816852a8cb6f0e.tar.xz
ansible-0b47bc5948fe16e2d3ba07c93e816852a8cb6f0e.zip
Merge branch 'master' of /git/ansible
-rw-r--r--roles/collectd/fedmsg-activation/files/fedmsg-map.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/collectd/fedmsg-activation/files/fedmsg-map.py b/roles/collectd/fedmsg-activation/files/fedmsg-map.py
index 5ca13655b..e03eae2a7 100644
--- a/roles/collectd/fedmsg-activation/files/fedmsg-map.py
+++ b/roles/collectd/fedmsg-activation/files/fedmsg-map.py
@@ -16,9 +16,6 @@ config = fedmsg.config.load_config()
timeout = 0.2
expected = '/wAAAAAAAAABfw=='
-active = collections.defaultdict(list)
-inactive = collections.defaultdict(list)
-
for_collectd = 'verbose' not in sys.argv
@@ -29,6 +26,9 @@ def info(content="\n"):
def do_scan():
+ active = collections.defaultdict(list)
+ inactive = collections.defaultdict(list)
+
for i, item in enumerate(config['endpoints'].items()):
name, endpoints = item
for endpoint in endpoints:
@@ -103,7 +103,7 @@ def do_scan():
if not for_collectd:
do_scan()
else:
- interval = 10
+ interval = 30
host = socket.getfqdn()
while True:
start = time.time()