Merge lp:~jjo/charms/trusty/rabbitmq-server/use-rabbitmqctl-q-for-list-cmds into lp:charms/trusty/rabbitmq-server

[JuanJo Ciarlante]

[jjo, r=] use '-q' for rabbitmqctl list_vhosts and list_users, to avoid the need to filter-out informational msgs

[lp:~jjo/charms/trusty/rabbitmq-server/use-rabbitmqctl-q-for-list-cmds]

84. By JuanJo Ciarlante on 2015-03-03

rstrip() before split()

Unmerged revisions

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-01-22 15:37:28 +0000
+++ hooks/rabbit_utils.py	2015-03-03 20:21:52 +0000
@@ -80,9 +80,9 @@
     Returns a list of all the available vhosts
     """
     try:
-        output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts'])
+        output = subprocess.check_output([RABBITMQ_CTL, 'list_vhosts', '-q'])
 
-        return output.split('\n')[1:-2]
+        return output.rstrip().split('\n')
     except Exception as ex:
         # if no vhosts, just raises an exception
         log(str(ex), level='DEBUG')
@@ -102,9 +102,9 @@
 
 
 def user_exists(user):
-    cmd = [RABBITMQ_CTL, 'list_users']
+    cmd = [RABBITMQ_CTL, 'list_users', '-q']
     out = subprocess.check_output(cmd)
-    for line in out.split('\n')[1:]:
+    for line in out.rstrip().split('\n'):
         _user = line.split('\t')[0]
         if _user == user:
             admin = line.split('\t')[1]