Changeset 10040 in genesis

Timestamp:

Mar 6, 2012, 1:51:47 PM (13 years ago)

Author:

rick

Message:

Use gformat of yaml parsing instead of using right paths.

File:

• tools/get-link-traffic.py (modified) (4 diffs)

tools/get-link-traffic.py

@@ -6 +6 @@
 # Rick van der Zwet <info@rickvanderzwet.nl>
 #
+import gformat
 import glob
 import logging
@@ -65 +66 @@
   ff = ''
 
-def process_file(logger, m_snmp, m_traffic, m_uptime, nf, rescan):
-  data = yaml.load(open(nf,'r'))
+def process_file(logger, m_snmp, m_traffic, m_uptime, host, rescan):
+  data = gformat.get_yaml(host)
   nodename = data['nodename']
 
@@ -113 +114 @@
   logger = logging.getLogger('Worker%s' % i)
   logger.info("Worker")
-  for (nf, rescan) in iter(input.get, 'STOP'):
-    process_file(logger, m_snmp, m_traffic, m_uptime, nf, rescan)
+  for (host, rescan) in iter(input.get, 'STOP'):
+    process_file(logger, m_snmp, m_traffic, m_uptime, host, rescan)
   logger.info("END")
 
@@ -140 +141 @@
     plist[i].start()
 
-  for nf in sorted(glob.glob('nodes/*%s*/wleiden.yaml' % ff)):
-    task_queue.put((nf, RESCAN))
+  for host in sorted(gformat.get_hostlist()):
+    if ff and not ff in host:
+      continue
+    task_queue.put((host, RESCAN))
 
   for i in range(NUMBER_OF_PROCESSES):