From 37da25699c17248ea35d613ce5c1c1813bc49c00 Mon Sep 17 00:00:00 2001
From: Marko Kreen
Date: Fri, 22 Mar 2013 17:25:26 +0200
Subject: cascadeadmin: cleanup of profile hack in status command

---
 python/pgq/cascade/admin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'python')

diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 58b8e5d0..dd9b670b 100644
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -438,7 +438,10 @@ class CascadeAdmin(skytools.AdminScript):
         # prepare structs for workers
         members = Queue.Queue()
         for m in self.queue_info.member_map.itervalues():
-            members.put(m)
+            cstr = m.location
+            if cstr_extra:
+                cstr += ' ' + cstr_extra
+            members.put( (m.name, cstr) )
         nodes = Queue.Queue()
 
         # launch workers and wait
@@ -467,13 +470,10 @@ class CascadeAdmin(skytools.AdminScript):
         # members in, nodes out, both thread-safe
         while True:
             try:
-                m = members.get_nowait()
+                node_name, node_connstr = members.get_nowait()
             except Queue.Empty:
                 break
-            loc = m.location
-            if cstr_extra:
-                loc = loc + ' ' + cstr_extra
-            node = self.load_node_status (m.name, loc)
+            node = self.load_node_status (node_name, node_connstr)
             nodes.put(node)
             members.task_done()
 
-- 
cgit v1.2.3