Pull in more fedmsg-map changes.

... from https://github.com/fedora-infra/fedmsg/pull/338

roles/collectd/fedmsg-activation/files/fedmsg-map.py

@@ -22,7 +22,7 @@ for_collectd = 'verbose' not in sys.argv
 active = collections.defaultdict(list)
 inactive = collections.defaultdict(list)
 
-pool = multiprocessing.pool.ThreadPool(10)
+pool = multiprocessing.pool.ThreadPool(25)
 
 def info(content="\n"):
     if not for_collectd:
@@ -30,8 +30,7 @@ def info(content="\n"):
         sys.stdout.flush()
 
 def scan_one(item):
-    name, endpoints = item
-    for endpoint in endpoints:
+    name, endpoint = item
     if not endpoint.startswith('tcp://'):
         raise ValueError("Don't know how to deal with %r" % endpoint)
     endpoint = endpoint[len('tcp://'):].split(':')
@@ -54,8 +53,10 @@ def scan_one(item):
 
 
 def scan_all():
-
-    pool.map(scan_one, config['endpoints'].items())
+    items = [(name, addr)
+             for name, endpoints in config['endpoints'].items()
+             for addr in endpoints]
+    pool.map(scan_one, items)
 
     info()
 
@@ -128,3 +129,5 @@ else:
         print(output)
         if interval - delta > 0:
             time.sleep(interval - delta)
+
+pool.close()