Fix "No data returned for command" events.

Fixes ZEN-3526. Reviewed by eedgar.
zenoss · Sep 25, 2012 · 6f79c94 · 6f79c94
1 parent 1318e3f
commit 6f79c94
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -250,3 +250,13 @@ Screenshots
 .. |Exchanges| image:: https://github.com/zenoss/ZenPacks.zenoss.RabbitMQ/raw/master/docs/exchanges.png
 .. |Queues| image:: https://github.com/zenoss/ZenPacks.zenoss.RabbitMQ/raw/master/docs/queues.png
 .. |Queue Metrics| image:: https://github.com/zenoss/ZenPacks.zenoss.RabbitMQ/raw/master/docs/queues_metrics.png
+
+
+Changes
+===============================================================================
+
+1.0.5
+-------------------------------------------------------------------------------
+
+* Fixed "No data returned for command" event when no queues, connections or
+  channels exist.
diff --git a/ZenPacks/zenoss/RabbitMQ/objects/objects.xml b/ZenPacks/zenoss/RabbitMQ/objects/objects.xml
@@ -32,7 +32,7 @@ rabbitmq_node_status
 4
 </property>
 <property type="string" id="commandTemplate" mode="w" >
-rabbitmqctl -q -n ${here/title} list_channels pid consumer_count messages_unacknowledged acks_uncommitted 2&gt;&amp;1
+rabbitmqctl -n ${here/title} list_channels pid consumer_count messages_unacknowledged acks_uncommitted 2&gt;&amp;1
 </property>
 <property type="int" id="cycletime" mode="w" >
 300
@@ -117,7 +117,7 @@ rabbitmq_node_status
 4
 </property>
 <property type="string" id="commandTemplate" mode="w" >
-rabbitmqctl -q -n ${here/title} list_connections pid channels recv_oct recv_cnt send_oct send_cnt send_pend 2&gt;&amp;1
+rabbitmqctl -n ${here/title} list_connections pid channels recv_oct recv_cnt send_oct send_cnt send_pend 2&gt;&amp;1
 </property>
 <property type="int" id="cycletime" mode="w" >
 300
@@ -763,7 +763,7 @@ rabbitmq_node_status
 4
 </property>
 <property type="string" id="commandTemplate" mode="w" >
-rabbitmqctl -q -n ${here/rabbitmq_node_name} list_queues -p ${here/rabbitmq_vhost_name} name messages_ready messages_unacknowledged messages consumers memory 2&gt;&amp;1
+rabbitmqctl -n ${here/rabbitmq_node_name} list_queues -p ${here/rabbitmq_vhost_name} name messages_ready messages_unacknowledged messages consumers memory 2&gt;&amp;1
 </property>
 <property type="int" id="cycletime" mode="w" >
 300

diff --git a/ZenPacks/zenoss/RabbitMQ/parsers/RabbitMQCTL.py b/ZenPacks/zenoss/RabbitMQ/parsers/RabbitMQCTL.py
@@ -93,7 +93,7 @@ def processListConnectionsResults(self, cmd, result):
 
             # pid, channels, recv_oct, recv_cnt, send_oct, send_cnt, send_pend
             if len(fields) != 7:
-                return
+                continue
 
             connections[fields[0]] = dict(
                 channels=int(fields[1]),
@@ -175,7 +175,7 @@ def processListChannelsResults(self, cmd, result):
 
             # pid consumer_count messages_unacknowledged acks_uncommitted
             if len(fields) != 4:
-                return
+                continue
 
             channels[fields[0]] = dict(
                 consumers=int(fields[1]),
@@ -214,7 +214,7 @@ def processListQueuesResults(self, cmd, result):
             # name messages_ready messages_unacknowledged messages consumers
             # memory
             if len(fields) != 6:
-                return
+                continue
 
             queues[fields[0]] = dict(
                 ready=int(fields[1]),

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 # or saved.  Do not modify them directly here.
 # NB: PACKAGES is deprecated
 NAME = "ZenPacks.zenoss.RabbitMQ"
-VERSION = "1.0.4"
+VERSION = "1.0.5"
 AUTHOR = "Zenoss Labs"
 LICENSE = "GPLv2"
 NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']