From d634e46e75688d3d4842191e79aed7103a53350f Mon Sep 17 00:00:00 2001 From: Adam Lowry Date: Wed, 31 Mar 2010 16:44:18 -0700 Subject: [PATCH] Handle queues with periods and dashes in the name, in display and config --- rabbitmq-consumers | 4 ++-- rabbitmq-messages | 4 ++-- rabbitmq-messages_unacknowledged | 4 ++-- rabbitmq-messages_uncommitted | 4 ++-- rabbitmq-queue_memory | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rabbitmq-consumers b/rabbitmq-consumers index 52ee6fe..c443859 100755 --- a/rabbitmq-consumers +++ b/rabbitmq-consumers @@ -31,7 +31,7 @@ fi VHOST=${vhost:-"/"} QUEUES=$(sudo rabbitmqctl list_queues -p $VHOST name | \ grep -v '^Listing' | \ - grep -v 'done\.$') + grep -v 'done\.$' | sed -e 's/[.-]/_/g' ) if [ "$1" = "config" ]; then QUEUE_WARN=${queue_warn:-100} @@ -71,4 +71,4 @@ fi sudo rabbitmqctl list_queues -p $VHOST name consumers| \ grep -v "^Listing" | grep -v "done.$" | \ - perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")' + perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")' diff --git a/rabbitmq-messages b/rabbitmq-messages index 95a6f76..317bb20 100755 --- a/rabbitmq-messages +++ b/rabbitmq-messages @@ -31,7 +31,7 @@ fi VHOST=${vhost:-"/"} QUEUES=$(sudo rabbitmqctl list_queues -p $VHOST name | \ grep -v '^Listing' | \ - grep -v 'done\.$') + grep -v 'done\.$' | sed -e 's/[.-]/_/g' ) if [ "$1" = "config" ]; then QUEUE_WARN=${queue_warn:-10000} @@ -71,4 +71,4 @@ fi sudo rabbitmqctl list_queues -p $VHOST | \ grep -v "^Listing" | grep -v "done.$" | \ - perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")' + perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")' diff --git a/rabbitmq-messages_unacknowledged b/rabbitmq-messages_unacknowledged index c6ec429..121cb72 100755 --- a/rabbitmq-messages_unacknowledged +++ b/rabbitmq-messages_unacknowledged @@ -31,7 +31,7 @@ fi VHOST=${vhost:-"/"} QUEUES=$(sudo rabbitmqctl list_queues -p $VHOST name | \ grep -v '^Listing' | \ - grep -v 'done\.$') + grep -v 'done\.$' | sed -e 's/[.-]/_/g' ) if [ "$1" = "config" ]; then QUEUE_WARN=${queue_warn:-10000} @@ -71,4 +71,4 @@ fi sudo rabbitmqctl list_queues -p $VHOST name messages_unacknowledged | \ grep -v "^Listing" | grep -v "done.$" | \ - perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")' + perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")' diff --git a/rabbitmq-messages_uncommitted b/rabbitmq-messages_uncommitted index 49b1adb..4a1bbe0 100755 --- a/rabbitmq-messages_uncommitted +++ b/rabbitmq-messages_uncommitted @@ -31,7 +31,7 @@ fi VHOST=${vhost:-"/"} QUEUES=$(sudo rabbitmqctl list_queues -p $VHOST name | \ grep -v '^Listing' | \ - grep -v 'done\.$') + grep -v 'done\.$' | sed -e 's/[.-]/_/g' ) if [ "$1" = "config" ]; then QUEUE_WARN=${queue_warn:-10000} @@ -71,4 +71,4 @@ fi sudo rabbitmqctl list_queues -p $VHOST name messages_uncommitted | \ grep -v "^Listing" | grep -v "done.$" | \ - perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")' + perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")' diff --git a/rabbitmq-queue_memory b/rabbitmq-queue_memory index 1cb300e..869f401 100755 --- a/rabbitmq-queue_memory +++ b/rabbitmq-queue_memory @@ -31,7 +31,7 @@ fi VHOST=${vhost:-"/"} QUEUES=$(sudo rabbitmqctl list_queues -p $VHOST name | \ grep -v '^Listing' | \ - grep -v 'done\.$') + grep -v 'done\.$' | sed -e 's/[.-]/_/g' ) if [ "$1" = "config" ]; then QUEUE_WARN=${queue_warn:-10000} @@ -71,4 +71,4 @@ fi sudo rabbitmqctl list_queues -p $VHOST name memory | \ grep -v "^Listing" | grep -v "done.$" | \ - perl -nle'($q, $s) = split; $q =~ s/\./_/g; print("$q.value $s")' + perl -nle'($q, $s) = split; $q =~ s/[.-]/_/g; print("$q.value $s")'