merging default into bug 22169

70 files changed, 1294 insertions, 564 deletions

diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ
index 2d0a7b1db2..221c93501d 100644
--- a/LICENSE-MPL-RabbitMQ
+++ b/LICENSE-MPL-RabbitMQ
@@ -454,11 +454,11 @@ EXHIBIT A -Mozilla Public License.
      are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
      Technologies LLC, and Rabbit Technologies Ltd.
 
-     Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
      Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     Copyright (C) 2007-2010 Cohesive Financial Technologies
      LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2009 Rabbit Technologies Ltd.
+     (C) 2007-2010 Rabbit Technologies Ltd.
 
      All Rights Reserved.
 
diff --git a/codegen.py b/codegen.py
index 6f39574f26..96109610ad 100644
--- a/codegen.py
+++ b/codegen.py
@@ -18,11 +18,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
@@ -116,11 +116,11 @@ def printFileHeader():
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -214,6 +214,8 @@ def genErl(spec):
             elif type == 'table':
                 print "  F%d = rabbit_binary_parser:parse_table(F%dTab)," % \
                       (f.index, f.index)
+            elif type == 'shortstr':
+                print "  if F%dLen > 255 -> exit(method_field_shortstr_overflow); true -> ok end," % (f.index)
             else:
                 pass
 
@@ -246,7 +248,10 @@ def genErl(spec):
             elif type == 'table':
                 print "  F%dTab = rabbit_binary_generator:generate_table(F%d)," % (f.index, f.index)
                 print "  F%dLen = size(F%dTab)," % (f.index, f.index)
-            elif type in ['shortstr', 'longstr']:
+            elif type == 'shortstr':
+                print "  F%dLen = size(F%d)," % (f.index, f.index)
+                print "  if F%dLen > 255 -> exit(method_field_shortstr_overflow); true -> ok end," % (f.index)
+            elif type == 'longstr':
                 print "  F%dLen = size(F%d)," % (f.index, f.index)
             else:
                 pass
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index 47c4d16860..e26767ab4f 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -98,6 +98,13 @@ nodes determined by I<clusternode> option(s). See
 L<http://www.rabbitmq.com/clustering.html> for more information about
 clustering.
 
+=item close_connection I<connectionpid> I<explanation>
+
+Instruct the broker to close the connection associated with the Erlang
+process id I<connectionpid> (see also the I<list_connections>
+command), passing the I<explanation> string to the connected client as
+part of the AMQP connection shutdown protocol.
+
 =back
 
 =head2 USER MANAGEMENT
@@ -202,6 +209,22 @@ queue arguments
 
 id of the Erlang process associated with the queue
 
+=item owner_pid
+
+id of the Erlang process representing the connection which is the
+exclusive owner of the queue, or empty if the queue is non-exclusive
+
+=item exclusive_consumer_pid
+
+id of the Erlang process representing the channel of the exclusive
+consumer subscribed to this queue, or empty if there is no exclusive
+consumer
+
+=item exclusive_consumer_tag
+
+consumer tag of the exclusive consumer subscribed to this queue, or
+empty if there is no exclusive consumer
+
 =item messages_ready
 
 number of messages ready to be delivered to clients
@@ -367,10 +390,87 @@ send queue size
 
 =back
 
-The list_queues, list_exchanges and list_bindings commands accept an
-optional virtual host parameter for which to display results,
-defaulting to I<"/">. The default can be overridden with the B<-p>
-flag.
+=over
+
+=item list_channels [I<channelinfoitem> ...]
+
+List channel information. Each line printed describes a channel, with
+the requested I<channelinfoitem> values separated by tab characters.
+If no I<channelinfoitem>s are specified then I<pid>, I<user>,
+I<transactional>, I<consumer_count>, and I<messages_unacknowledged>
+are assumed.
+
+The list includes channels which are part of ordinary AMQP connections
+(as listed by list_connections) and channels created by various
+plug-ins and other extensions.
+
+=back
+
+=head3 Channel information items
+
+=over
+
+=item pid
+
+id of the Erlang process associated with the channel
+
+=item connection
+
+id of the Erlang process associated with the connection to which the
+channel belongs
+
+=item number
+
+the number of the channel, which uniquely identifies it within a
+connection
+
+=item user
+
+username associated with the channel
+
+=item vhost
+
+virtual host in which the channel operates
+
+=item transactional
+
+true if the channel is in transactional mode, false otherwise
+
+=item consumer_count
+
+number of logical AMQP consumers retrieving messages via the channel
+
+=item messages_unacknowledged
+
+number of messages delivered via this channel but not yet acknowledged
+
+=item acks_uncommitted
+
+number of acknowledgements received in an as yet uncommitted
+transaction
+
+=item prefetch_count
+
+QoS prefetch count limit in force, 0 if unlimited
+
+=back
+
+=item list_consumers
+
+List consumers, i.e. subscriptions to a queue's message stream. Each
+line printed shows, separated by tab characters, the name of the queue
+subscribed to, the id of the channel process via which the
+subscription was created and is managed, the consumer tag which
+uniquely identifies the subscription within a channel, and a boolean
+indicating whether acknowledgements are expected for messages
+delivered to this consumer.
+
+=back
+
+The list_queues, list_exchanges, list_bindings and list_consumers
+commands accept an optional virtual host parameter for which to
+display results, defaulting to I<"/">. The default can be overridden
+with the B<-p> flag.
 
 =head1 OUTPUT ESCAPING
 
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 38d8c89974..e2980eff70 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -170,7 +170,7 @@
 
 %%----------------------------------------------------------------------------
 
--define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.").
+-define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.").
 -define(INFORMATION_MESSAGE, "Licensed under the MPL.  See http://www.rabbitmq.com/").
 
 -ifdef(debug).
diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl
index 16af8ad3bc..1a9798998c 100644
--- a/include/rabbit_framing_spec.hrl
+++ b/include/rabbit_framing_spec.hrl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 4dd223086f..54d0c8f38b 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -118,6 +118,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon Feb 15 2010 Matthew Sackman <matthew@lshift.net> 1.7.2-1
+- New Upstream Release
+
 * Fri Jan 22 2010 Matthew Sackman <matthew@lshift.net> 1.7.1-1
 - New Upstream Release
 
diff --git a/packaging/common/rabbitmq-asroot-script-wrapper b/packaging/common/rabbitmq-asroot-script-wrapper
index ee5947b66c..693a6f0b83 100644
--- a/packaging/common/rabbitmq-asroot-script-wrapper
+++ b/packaging/common/rabbitmq-asroot-script-wrapper
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper
index f66f8e59af..79096a4e92 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/packaging/common/rabbitmq-script-wrapper
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 796a301a29..63b50749e1 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.7.2-1) intrepid; urgency=low
+
+  * New Upstream Release
+
+ -- Matthew Sackman <matthew@lshift.net>  Mon, 15 Feb 2010 15:54:47 +0000
+
 rabbitmq-server (1.7.1-1) intrepid; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/copyright b/packaging/debs/Debian/debian/copyright
index 69867220f0..a569f31aaa 100755
--- a/packaging/debs/Debian/debian/copyright
+++ b/packaging/debs/Debian/debian/copyright
@@ -5,7 +5,7 @@ It was downloaded from http://www.rabbitmq.com/
 
 The file codegen/amqp-0.8.json is covered by the following terms:
 
-        "Copyright (C) 2008-2009 LShift Ltd, Cohesive Financial Technologies LLC,
+        "Copyright (C) 2008-2010 LShift Ltd, Cohesive Financial Technologies LLC,
         and Rabbit Technologies Ltd
         
         Permission is hereby granted, free of charge, to any person
@@ -39,11 +39,11 @@ Authors and Copyright are as described below:
      are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
      Technologies LLC, and Rabbit Technologies Ltd.
 
-     Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
      Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     Copyright (C) 2007-2010 Cohesive Financial Technologies
      LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2009 Rabbit Technologies Ltd.
+     (C) 2007-2010 Rabbit Technologies Ltd.
 
 
                           MOZILLA PUBLIC LICENSE
@@ -502,11 +502,11 @@ EXHIBIT A -Mozilla Public License.
      are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
      Technologies LLC, and Rabbit Technologies Ltd.
 
-     Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+     Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
      Ltd. Portions created by Cohesive Financial Technologies LLC are
-     Copyright (C) 2007-2009 Cohesive Financial Technologies
+     Copyright (C) 2007-2010 Cohesive Financial Technologies
      LLC. Portions created by Rabbit Technologies Ltd are Copyright
-     (C) 2007-2009 Rabbit Technologies Ltd.
+     (C) 2007-2010 Rabbit Technologies Ltd.
 
      All Rights Reserved.
 
@@ -524,7 +524,7 @@ EXHIBIT A -Mozilla Public License.
 If you have any questions regarding licensing, please contact us at 
 info@rabbitmq.com.
 
-The Debian packaging is (C) 2007-2009, Rabbit Technologies Ltd. <info@rabbitmq.com>
+The Debian packaging is (C) 2007-2010, Rabbit Technologies Ltd. <info@rabbitmq.com>
 and is licensed under the MPL 1.1, see above.
 
 
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
index 4db305eb58..d5633955b9 100644
--- a/packaging/macports/Makefile
+++ b/packaging/macports/Makefile
@@ -35,13 +35,9 @@ macports: dirs $(DEST)/Portfile
 	for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \
 	  cp $(COMMON_DIR)/$$f $(DEST)/files ; \
 	done
-	sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -u rabbitmq -H /bin/sh -c|' \
+	sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -E -u rabbitmq -H /bin/sh -c|' \
 	    $(DEST)/files/rabbitmq-script-wrapper
 	cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files
-
-# This target ssh's into the OSX host in order to finalize the
-# macports repo
-macports_index:
 	if [ -n "$(MACPORTS_USERHOST)" ] ; then \
 	  tar cf - -C $(MACPORTS_DIR) . | ssh $(SSH_OPTS) lshift@macrabbit ' \
 	    d="/tmp/mkportindex.$$$$" ; \
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index f17fe77742..c9e818ac8b 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -22,7 +22,7 @@ dist:
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
-	unix2dos $(TARGET_DIR)/readme-service.txt
+	todos $(TARGET_DIR)/readme-service.txt
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)
 
diff --git a/scripts/rabbitmq-activate-plugins b/scripts/rabbitmq-activate-plugins
index 5ce64c686c..00ee6c61c8 100755
--- a/scripts/rabbitmq-activate-plugins
+++ b/scripts/rabbitmq-activate-plugins
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat
index e7aa709544..3c9a057c95 100644
--- a/scripts/rabbitmq-activate-plugins.bat
+++ b/scripts/rabbitmq-activate-plugins.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,7 +32,13 @@ REM
 

 setlocal

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly. 

@@ -44,17 +50,18 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-set RABBITMQ_PLUGINS_DIR=%~dp0..\plugins

-set RABBITMQ_PLUGINS_EXPAND_DIR=%~dp0..\priv\plugins

-set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

+set RABBITMQ_PLUGINS_EXPAND_DIR=!TDP0!..\priv\plugins

+set RABBITMQ_EBIN_DIR=!TDP0!..\ebin

 

-"%ERLANG_HOME%\bin\erl.exe" ^

--pa "%RABBITMQ_EBIN_DIR%" ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+-pa "!RABBITMQ_EBIN_DIR!" ^

 -noinput -hidden ^

 -s rabbit_plugin_activator ^

--rabbit plugins_dir \""%RABBITMQ_PLUGINS_DIR:\=/%"\" ^

--rabbit plugins_expand_dir \""%RABBITMQ_PLUGINS_EXPAND_DIR:\=/%"\" ^

--rabbit rabbit_ebin  \""%RABBITMQ_EBIN_DIR:\=/%"\" ^

--extra %*

+-rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

+-rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

+-rabbit rabbit_ebin  \""!RABBITMQ_EBIN_DIR:\=/!"\" ^

+-extra !STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-deactivate-plugins b/scripts/rabbitmq-deactivate-plugins
index 771c473496..3fd71bfacd 100755
--- a/scripts/rabbitmq-deactivate-plugins
+++ b/scripts/rabbitmq-deactivate-plugins
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-deactivate-plugins.bat b/scripts/rabbitmq-deactivate-plugins.bat
index 40155183a1..1bc3f88efd 100644
--- a/scripts/rabbitmq-deactivate-plugins.bat
+++ b/scripts/rabbitmq-deactivate-plugins.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,8 +32,14 @@ REM
 

 setlocal

 

-set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+setlocal enabledelayedexpansion

 

-del /f "%RABBITMQ_EBIN_DIR%"\rabbit.rel "%RABBITMQ_EBIN_DIR%"\rabbit.script "%RABBITMQ_EBIN_DIR%"\rabbit.boot

+set RABBITMQ_EBIN_DIR=!TDP0!..\ebin

 

+del /f "!RABBITMQ_EBIN_DIR!"\rabbit.rel "!RABBITMQ_EBIN_DIR!"\rabbit.script "!RABBITMQ_EBIN_DIR!"\rabbit.boot

+

+endlocal

 endlocal

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 69ddbcfed1..36734874e7 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index a6eb102a4b..8341d35c8c 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
@@ -40,8 +40,8 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 6dda13af37..a4b7f2e99b 100755..100644
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,38 +32,44 @@ REM
 

 setlocal

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\RabbitMQ

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

+   if "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_PORT=5672

    )

 )

 

-set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

-set RABBITMQ_SCRIPT_HOME=%~sdp0%

+set RABBITMQ_PIDS_FILE=!RABBITMQ_BASE!\rabbitmq.pids

+set RABBITMQ_SCRIPT_HOME=!TDP0!

 

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

 

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly.

@@ -75,14 +81,15 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" ^

--pa "%~dp0..\ebin" ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+-pa "!TDP0!..\ebin" ^

 -noinput -hidden ^

-%RABBITMQ_MULTI_ERL_ARGS% ^

+!RABBITMQ_MULTI_ERL_ARGS! ^

 -sname rabbitmq_multi ^

-%RABBITMQ_CONFIG_ARG% ^

+!RABBITMQ_CONFIG_ARG! ^

 -s rabbit_multi ^

-%RABBITMQ_MULTI_START_ARGS% ^

--extra %*

+!RABBITMQ_MULTI_START_ARGS! ^

+-extra !STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index cbc295f7d9..638498c1e2 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
@@ -32,7 +32,7 @@
 
 NODENAME=rabbit
 SERVER_ERL_ARGS="+K true +A30 \
--kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
+-kernel inet_default_listen_options [{nodelay,true}] \
 -kernel inet_default_connect_options [{nodelay,true}]"
 CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
 CONFIG_FILE=/etc/rabbitmq/rabbitmq
@@ -44,8 +44,8 @@ SERVER_START_ARGS=
 
 DEFAULT_NODE_IP_ADDRESS=0.0.0.0
 DEFAULT_NODE_PORT=5672
-[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
-[ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
+[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS}
+[ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT}
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5110285128..28eb8ebb8d 100755..100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,25 +32,31 @@ REM
 

 setlocal

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\RabbitMQ

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

+   if "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_PORT=5672

    )

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly.

@@ -62,13 +68,13 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-set RABBITMQ_BASE_UNIX=%RABBITMQ_BASE:\=/%

+set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/!

 

-if "%RABBITMQ_MNESIA_BASE%"=="" (

-    set RABBITMQ_MNESIA_BASE=%RABBITMQ_BASE_UNIX%/db

+if "!RABBITMQ_MNESIA_BASE!"=="" (

+    set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db

 )

-if "%RABBITMQ_LOG_BASE%"=="" (

-    set RABBITMQ_LOG_BASE=%RABBITMQ_BASE_UNIX%/log

+if "!RABBITMQ_LOG_BASE!"=="" (

+    set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log

 )

 

 

@@ -77,81 +83,82 @@ rem Log management (rotation, filtering based of size...) is left as an exercice
 

 set BACKUP_EXTENSION=.1

 

-set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

-set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

+set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log

+set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log

 

-set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

-set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

+set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION!

+set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION!

 

-if exist "%LOGS%" (

-    type "%LOGS%" >> "%LOGS_BACKUP%"

+if exist "!LOGS!" (

+    type "!LOGS!" >> "!LOGS_BACKUP!"

 )

-if exist "%SASL_LOGS%" (

-    type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

+if exist "!SASL_LOGS!" (

+    type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!"

 )

 

 rem End of log management

 

 

-if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

 )

 set CLUSTER_CONFIG=

-if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

 :L1

 

-if "%RABBITMQ_MNESIA_DIR%"=="" (

-    set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

+if "!RABBITMQ_MNESIA_DIR!"=="" (

+    set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

-set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

-if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

-    echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

-    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

+set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

+if exist "!RABBITMQ_EBIN_ROOT!\rabbit.boot" (

+    echo Using Custom Boot File "!RABBITMQ_EBIN_ROOT!\rabbit.boot"

+    set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

     set RABBITMQ_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

-    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+    set RABBITMQ_EBIN_PATH=-pa "!RABBITMQ_EBIN_ROOT!"

 )

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

 

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

 set RABBITMQ_LISTEN_ARG=

-if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""%RABBITMQ_NODE_IP_ADDRESS%"\","%RABBITMQ_NODE_PORT%"}]

+if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""!RABBITMQ_NODE_IP_ADDRESS!"\","!RABBITMQ_NODE_PORT!"}]

    )

 )

 

-"%ERLANG_HOME%\bin\erl.exe" ^

-%RABBITMQ_EBIN_PATH% ^

+"!ERLANG_HOME!\bin\erl.exe" ^

+!RABBITMQ_EBIN_PATH! ^

 -noinput ^

--boot "%RABBITMQ_BOOT_FILE%" ^

-%RABBITMQ_CONFIG_ARG% ^

--sname %RABBITMQ_NODENAME% ^

+-boot "!RABBITMQ_BOOT_FILE!" ^

+!RABBITMQ_CONFIG_ARG! ^

+-sname !RABBITMQ_NODENAME! ^

 -s rabbit ^

 +W w ^

 +A30 ^

--kernel inet_default_listen_options "[{nodelay, true}, {sndbuf, 16384}, {recbuf, 4096}]" ^

+-kernel inet_default_listen_options "[{nodelay, true}]" ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

-%RABBITMQ_LISTEN_ARG% ^

--kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

-%RABBITMQ_SERVER_ERL_ARGS% ^

+!RABBITMQ_LISTEN_ARG! ^

+-kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^

+!RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

-%CLUSTER_CONFIG% ^

-%RABBITMQ_SERVER_START_ARGS% ^

-%*

+-mnesia dir \""!RABBITMQ_MNESIA_DIR!"\" ^

+!CLUSTER_CONFIG! ^

+!RABBITMQ_SERVER_START_ARGS! ^

+!STAR!

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 4668112576..a4021fd6a1 100755..100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,61 +32,82 @@ REM
 

 setlocal

 

-if "%RABBITMQ_SERVICENAME%"=="" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TN0=%~n0

+set TDP0=%~dp0

+set P1=%1

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_SERVICENAME!"=="" (

     set RABBITMQ_SERVICENAME=RabbitMQ

 )

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\%RABBITMQ_SERVICENAME%

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\!RABBITMQ_SERVICENAME!

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

-   )

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+    if not "!RABBITMQ_NODE_PORT!"=="" (

+       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

+    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_NODE_PORT=5672

-   )

-)

-

-if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

-    set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

+    if "!RABBITMQ_NODE_PORT!"=="" (

+       set RABBITMQ_NODE_PORT=5672

+    )

+)

+

+if "!ERLANG_SERVICE_MANAGER_PATH!"=="" (

+    if not exist "!ERLANG_HOME!\bin\erl.exe" (

+        echo.

+        echo ******************************

+        echo ERLANG_HOME not set correctly.

+        echo ******************************

+        echo.

+        echo Please either set ERLANG_HOME to point to your Erlang installation or place the

+        echo RabbitMQ server distribution in the Erlang lib folder.

+        echo.

+        exit /B

+    )

+    for /f "delims=" %%i in ('dir /ad/b "!ERLANG_HOME!"') do if exist "!ERLANG_HOME!\%%i\bin\erlsrv.exe" (

+        set ERLANG_SERVICE_MANAGER_PATH=!ERLANG_HOME!\%%i\bin

+    )

 )

 

 set CONSOLE_FLAG=

 set CONSOLE_LOG_VALID=

-for %%i in (new reuse) do if "%%i" == "%RABBITMQ_CONSOLE_LOG%" set CONSOLE_LOG_VALID=TRUE

-if "%CONSOLE_LOG_VALID%" == "TRUE" (

-    set CONSOLE_FLAG=-debugtype %RABBITMQ_CONSOLE_LOG%

+for %%i in (new reuse) do if "%%i" == "!RABBITMQ_CONSOLE_LOG!" set CONSOLE_LOG_VALID=TRUE

+if "!CONSOLE_LOG_VALID!" == "TRUE" (

+    set CONSOLE_FLAG=-debugtype !RABBITMQ_CONSOLE_LOG!

 )

 

 rem *** End of configuration ***

 

-if not exist "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" (

+if not exist "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" (

     echo.

     echo **********************************************

     echo ERLANG_SERVICE_MANAGER_PATH not set correctly. 

     echo **********************************************

     echo.

-    echo "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" not found!

+    echo "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv.exe" not found

     echo Please set ERLANG_SERVICE_MANAGER_PATH to the folder containing "erlsrv.exe".

     echo.

     exit /B 1

 )

 

 rem erlang prefers forwardslash as separator in paths

-set RABBITMQ_BASE_UNIX=%RABBITMQ_BASE:\=/%

+set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/!

 

-if "%RABBITMQ_MNESIA_BASE%"=="" (

-    set RABBITMQ_MNESIA_BASE=%RABBITMQ_BASE_UNIX%/db

+if "!RABBITMQ_MNESIA_BASE!"=="" (

+    set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db

 )

-if "%RABBITMQ_LOG_BASE%"=="" (

-    set RABBITMQ_LOG_BASE=%RABBITMQ_BASE_UNIX%/log

+if "!RABBITMQ_LOG_BASE!"=="" (

+    set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log

 )

 

 

@@ -95,139 +116,140 @@ rem Log management (rotation, filtering based on size...) is left as an exercise
 

 set BACKUP_EXTENSION=.1

 

-set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

-set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

+set LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log

+set SASL_LOGS=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log

 

-set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

-set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

+set LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!.log!BACKUP_EXTENSION!

+set SASL_LOGS_BACKUP=!RABBITMQ_BASE!\log\!RABBITMQ_NODENAME!-sasl.log!BACKUP_EXTENSION!

 

-if exist "%LOGS%" (

-	type "%LOGS%" >> "%LOGS_BACKUP%"

+if exist "!LOGS!" (

+	type "!LOGS!" >> "!LOGS_BACKUP!"

 )

-if exist "%SASL_LOGS%" (

-	type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

+if exist "!SASL_LOGS!" (

+	type "!SASL_LOGS!" >> "!SASL_LOGS_BACKUP!"

 )

 

 rem End of log management

 

 

-if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

 )

 set CLUSTER_CONFIG=

-if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

 :L1

 

-if "%RABBITMQ_MNESIA_DIR%"=="" (

-    set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

+if "!RABBITMQ_MNESIA_DIR!"=="" (

+    set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

 

 

-if "%1" == "install" goto INSTALL_SERVICE

-for %%i in (start stop disable enable list remove) do if "%%i" == "%1" goto MODIFY_SERVICE 

+if "!P1!" == "install" goto INSTALL_SERVICE

+for %%i in (start stop disable enable list remove) do if "%%i" == "!P1!" goto MODIFY_SERVICE 

 

 echo.

 echo *********************

 echo Service control usage

 echo *********************

 echo.

-echo %~n0 help    - Display this help

-echo %~n0 install - Install the %RABBITMQ_SERVICENAME% service

-echo %~n0 remove  - Remove the %RABBITMQ_SERVICENAME% service

+echo !TN0! help    - Display this help

+echo !TN0! install - Install the !RABBITMQ_SERVICENAME! service

+echo !TN0! remove  - Remove the !RABBITMQ_SERVICENAME! service

 echo.

 echo The following actions can also be accomplished by using 

 echo Windows Services Management Console (services.msc):

 echo.

-echo %~n0 start   - Start the %RABBITMQ_SERVICENAME% service

-echo %~n0 stop    - Stop the %RABBITMQ_SERVICENAME% service

-echo %~n0 disable - Disable the %RABBITMQ_SERVICENAME% service

-echo %~n0 enable  - Enable the %RABBITMQ_SERVICENAME% service

+echo !TN0! start   - Start the !RABBITMQ_SERVICENAME! service

+echo !TN0! stop    - Stop the !RABBITMQ_SERVICENAME! service

+echo !TN0! disable - Disable the !RABBITMQ_SERVICENAME! service

+echo !TN0! enable  - Enable the !RABBITMQ_SERVICENAME! service

 echo.

 exit /B

 

 

 :INSTALL_SERVICE

 

-if not exist "%RABBITMQ_BASE%" (

-    echo Creating base directory %RABBITMQ_BASE% & md "%RABBITMQ_BASE%" 

+if not exist "!RABBITMQ_BASE!" (

+    echo Creating base directory !RABBITMQ_BASE! & md "!RABBITMQ_BASE!" 

 )

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" list %RABBITMQ_SERVICENAME% 2>NUL 1>NUL

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" list !RABBITMQ_SERVICENAME! 2>NUL 1>NUL

 if errorlevel 1 (

-    "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" add %RABBITMQ_SERVICENAME%

+    "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" add !RABBITMQ_SERVICENAME!

 ) else (

-    echo %RABBITMQ_SERVICENAME% service is already present - only updating service parameters

+    echo !RABBITMQ_SERVICENAME! service is already present - only updating service parameters

 )

 

-set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

-if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

-    echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

-    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

+set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

+if exist "!RABBITMQ_EBIN_ROOT!\rabbit.boot" (

+    echo Using Custom Boot File "!RABBITMQ_EBIN_ROOT!\rabbit.boot"

+    set RABBITMQ_BOOT_FILE=!RABBITMQ_EBIN_ROOT!\rabbit

     set RABBITMQ_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

-    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+    set RABBITMQ_EBIN_PATH=-pa "!RABBITMQ_EBIN_ROOT!"

 )

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

    

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

 set RABBITMQ_LISTEN_ARG=

-if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]"

+if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"!RABBITMQ_NODE_IP_ADDRESS!\", !RABBITMQ_NODE_PORT!}]"

    )

 )

 

 set ERLANG_SERVICE_ARGUMENTS= ^

-%RABBITMQ_EBIN_PATH% ^

--boot "%RABBITMQ_BOOT_FILE%" ^

-%RABBITMQ_CONFIG_ARG% ^

+!RABBITMQ_EBIN_PATH! ^

+-boot "!RABBITMQ_BOOT_FILE!" ^

+!RABBITMQ_CONFIG_ARG! ^

 -s rabbit ^

 +W w ^

 +A30 ^

--kernel inet_default_listen_options "[{nodelay,true},{sndbuf,16384},{recbuf,4096}]" ^

+-kernel inet_default_listen_options "[{nodelay,true}]" ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

-%RABBITMQ_LISTEN_ARG% ^

--kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

-%RABBITMQ_SERVER_ERL_ARGS% ^

+!RABBITMQ_LISTEN_ARG! ^

+-kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^

+!RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

-%CLUSTER_CONFIG% ^

-%RABBITMQ_SERVER_START_ARGS% ^

-%*

-

-set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:\=\\%

-set ERLANG_SERVICE_ARGUMENTS=%ERLANG_SERVICE_ARGUMENTS:"=\"%

-

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" set %RABBITMQ_SERVICENAME% ^

--machine "%ERLANG_SERVICE_MANAGER_PATH%\erl.exe" ^

--env ERL_CRASH_DUMP="%RABBITMQ_BASE_UNIX%/erl_crash.dump" ^

--workdir "%RABBITMQ_BASE%" ^

+-mnesia dir \""!RABBITMQ_MNESIA_DIR!"\" ^

+!CLUSTER_CONFIG! ^

+!RABBITMQ_SERVER_START_ARGS! ^

+!STAR!

+

+set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

+set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!

+

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" set !RABBITMQ_SERVICENAME! ^

+-machine "!ERLANG_SERVICE_MANAGER_PATH!\erl.exe" ^

+-env ERL_CRASH_DUMP="!RABBITMQ_BASE_UNIX!/erl_crash.dump" ^

+-workdir "!RABBITMQ_BASE!" ^

 -stopaction "rabbit:stop_and_halt()." ^

--sname %RABBITMQ_NODENAME% ^

-%CONSOLE_FLAG% ^

--args "%ERLANG_SERVICE_ARGUMENTS%" > NUL

+-sname !RABBITMQ_NODENAME! ^

+!CONSOLE_FLAG! ^

+-args "!ERLANG_SERVICE_ARGUMENTS!" > NUL

 goto END

 

 

 :MODIFY_SERVICE

 

-"%ERLANG_SERVICE_MANAGER_PATH%\erlsrv" %1 %RABBITMQ_SERVICENAME%

+"!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" !P1! !RABBITMQ_SERVICENAME!

 goto END

 

 

 :END

 

 endlocal

+endlocal

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index a332afc6ca..cfb775eb67 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -19,11 +19,11 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 512e8587dc..5557245165 100755..100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,11 +32,17 @@ REM
 

 setlocal

 

-if "%RABBITMQ_NODENAME%"=="" (

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if not exist "%ERLANG_HOME%\bin\erl.exe" (

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

     echo ERLANG_HOME not set correctly. 

@@ -48,6 +54,7 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden %RABBITMQ_CTL_ERL_ARGS% -sname rabbitmqctl -s rabbit_control -nodename %RABBITMQ_NODENAME% -extra %*

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!

 

 endlocal

+endlocal

diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 1b24f28e28..c33582e30d 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -57,7 +57,7 @@
 %% being used. Instead it'll wait for the current timeout as described
 %% above.
 
-%% All modifications are (C) 2009 LShift Ltd.
+%% All modifications are (C) 2009-2010 LShift Ltd.
 
 %% ``The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/src/pg_local.erl b/src/pg_local.erl
new file mode 100644
index 0000000000..fa41fe46b3
--- /dev/null
+++ b/src/pg_local.erl
@@ -0,0 +1,213 @@
+%% This file is a copy of pg2.erl from the R13B-3 Erlang/OTP
+%% distribution, with the following modifications:
+%%
+%% 1) Process groups are node-local only.
+%%
+%% 2) Groups are created/deleted implicitly.
+%%
+%% 3) 'join' and 'leave' are asynchronous.
+%%
+%% 4) the type specs of the exported non-callback functions have been
+%%    extracted into a separate, guarded section, and rewritten in
+%%    old-style spec syntax, for better compatibility with older
+%%    versions of Erlang/OTP. The remaining type specs have been
+%%    removed.
+
+%% All modifications are (C) 2010 LShift Ltd.
+
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+-module(pg_local).
+
+-export([join/2, leave/2, get_members/1]).
+-export([sync/0]). %% intended for testing only; not part of official API
+-export([start/0,start_link/0,init/1,handle_call/3,handle_cast/2,handle_info/2,
+         terminate/2]).
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-type(name() :: term()).
+
+-spec(start_link/0 :: () -> {'ok', pid()} | {'error', term()}).
+-spec(start/0 :: () -> {'ok', pid()} | {'error', term()}).
+-spec(join/2 :: (name(), pid()) -> 'ok').
+-spec(leave/2 :: (name(), pid()) -> 'ok').
+-spec(get_members/1 :: (name()) -> [pid()]).
+
+-spec(sync/0 :: () -> 'ok').
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
+%%% As of R13B03 monitors are used instead of links.
+
+%%%
+%%% Exported functions
+%%%
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+start() ->
+    ensure_started().
+
+join(Name, Pid) when is_pid(Pid) ->
+    ensure_started(),
+    gen_server:cast(?MODULE, {join, Name, Pid}).
+
+leave(Name, Pid) when is_pid(Pid) ->
+    ensure_started(),
+    gen_server:cast(?MODULE, {leave, Name, Pid}).
+
+get_members(Name) ->
+    ensure_started(),
+    group_members(Name).
+
+sync() ->
+    ensure_started(),
+    gen_server:call(?MODULE, sync).
+
+%%%
+%%% Callback functions from gen_server
+%%%
+
+-record(state, {}).
+
+init([]) ->
+    pg_local_table = ets:new(pg_local_table, [ordered_set, protected, named_table]),
+    {ok, #state{}}.
+
+handle_call(sync, _From, S) ->
+    {reply, ok, S};
+
+handle_call(Request, From, S) ->
+    error_logger:warning_msg("The pg_local server received an unexpected message:\n"
+                             "handle_call(~p, ~p, _)\n", 
+                             [Request, From]),
+    {noreply, S}.
+
+handle_cast({join, Name, Pid}, S) ->
+    join_group(Name, Pid),
+    {noreply, S};
+handle_cast({leave, Name, Pid}, S) ->
+    leave_group(Name, Pid),
+    {noreply, S};
+handle_cast(_, S) ->
+    {noreply, S}.
+
+handle_info({'DOWN', MonitorRef, process, _Pid, _Info}, S) ->
+    member_died(MonitorRef),
+    {noreply, S};
+handle_info(_, S) ->
+    {noreply, S}.
+
+terminate(_Reason, _S) ->
+    true = ets:delete(pg_local_table),
+    ok.
+
+%%%
+%%% Local functions
+%%%
+
+%%% One ETS table, pg_local_table, is used for bookkeeping. The type of the
+%%% table is ordered_set, and the fast matching of partially
+%%% instantiated keys is used extensively.
+%%%
+%%% {{ref, Pid}, MonitorRef, Counter}
+%%% {{ref, MonitorRef}, Pid}
+%%%    Each process has one monitor. Counter is incremented when the
+%%%    Pid joins some group.
+%%% {{member, Name, Pid}, _}
+%%%    Pid is a member of group Name, GroupCounter is incremented when the
+%%%    Pid joins the group Name.
+%%% {{pid, Pid, Name}}
+%%%    Pid is a member of group Name.
+
+member_died(Ref) ->
+    [{{ref, Ref}, Pid}] = ets:lookup(pg_local_table, {ref, Ref}),
+    Names = member_groups(Pid),
+    _ = [leave_group(Name, P) || 
+            Name <- Names,
+            P <- member_in_group(Pid, Name)],
+    ok.
+
+join_group(Name, Pid) ->
+    Ref_Pid = {ref, Pid}, 
+    try _ = ets:update_counter(pg_local_table, Ref_Pid, {3, +1})
+    catch _:_ ->
+            Ref = erlang:monitor(process, Pid),
+            true = ets:insert(pg_local_table, {Ref_Pid, Ref, 1}),
+            true = ets:insert(pg_local_table, {{ref, Ref}, Pid})
+    end,
+    Member_Name_Pid = {member, Name, Pid},
+    try _ = ets:update_counter(pg_local_table, Member_Name_Pid, {2, +1})
+    catch _:_ ->
+            true = ets:insert(pg_local_table, {Member_Name_Pid, 1}),
+            true = ets:insert(pg_local_table, {{pid, Pid, Name}})
+    end.
+
+leave_group(Name, Pid) ->
+    Member_Name_Pid = {member, Name, Pid},
+    try ets:update_counter(pg_local_table, Member_Name_Pid, {2, -1}) of
+        N ->
+            if 
+                N =:= 0 ->
+                    true = ets:delete(pg_local_table, {pid, Pid, Name}),
+                    true = ets:delete(pg_local_table, Member_Name_Pid);
+                true ->
+                    ok
+            end,
+            Ref_Pid = {ref, Pid}, 
+            case ets:update_counter(pg_local_table, Ref_Pid, {3, -1}) of
+                0 ->
+                    [{Ref_Pid,Ref,0}] = ets:lookup(pg_local_table, Ref_Pid),
+                    true = ets:delete(pg_local_table, {ref, Ref}),
+                    true = ets:delete(pg_local_table, Ref_Pid),
+                    true = erlang:demonitor(Ref, [flush]),
+                    ok;
+                _ ->
+                    ok
+            end
+    catch _:_ ->
+            ok
+    end.
+
+group_members(Name) ->
+    [P || 
+        [P, N] <- ets:match(pg_local_table, {{member, Name, '$1'},'$2'}),
+        _ <- lists:seq(1, N)].
+
+member_in_group(Pid, Name) ->
+    [{{member, Name, Pid}, N}] = ets:lookup(pg_local_table, {member, Name, Pid}),
+    lists:duplicate(N, Pid).
+
+member_groups(Pid) ->
+    [Name || [Name] <- ets:match(pg_local_table, {{pid, Pid, '$1'}})].
+
+ensure_started() ->
+    case whereis(?MODULE) of
+        undefined ->
+            C = {pg_local, {?MODULE, start_link, []}, permanent,
+                 1000, worker, [?MODULE]},
+            supervisor:start_child(kernel_safe_sup, C);
+        PgLocalPid ->
+            {ok, PgLocalPid}
+    end.
diff --git a/src/priority_queue.erl b/src/priority_queue.erl
index 74b41a910c..1e481ca718 100644
--- a/src/priority_queue.erl
+++ b/src/priority_queue.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 51d8f9e0ba..6084be1b24 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 6ff7a1046c..a445f44197 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 534409aaea..3b9eeec18a 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index bcea4c97db..d495c4ee32 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -36,7 +36,8 @@
 -export([pseudo_queue/2]).
 -export([lookup/1, with/2, with_or_die/2,
          stat/1, stat_all/0, deliver/2, redeliver/2, requeue/3, ack/4]).
--export([list/1, info/1, info/2, info_all/1, info_all/2]).
+-export([list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2]).
+-export([consumers/1, consumers_all/1]).
 -export([claim_queue/2]).
 -export([basic_get/3, basic_consume/8, basic_cancel/4]).
 -export([notify_sent/2, unblock/2]).
@@ -69,10 +70,14 @@
 -spec(with/2 :: (queue_name(), qfun(A)) -> A | not_found()).
 -spec(with_or_die/2 :: (queue_name(), qfun(A)) -> A).
 -spec(list/1 :: (vhost()) -> [amqqueue()]).
+-spec(info_keys/0 :: () -> [info_key()]).
 -spec(info/1 :: (amqqueue()) -> [info()]).
 -spec(info/2 :: (amqqueue(), [info_key()]) -> [info()]).
 -spec(info_all/1 :: (vhost()) -> [[info()]]).
 -spec(info_all/2 :: (vhost(), [info_key()]) -> [[info()]]).
+-spec(consumers/1 :: (amqqueue()) -> [{pid(), ctag(), boolean()}]).
+-spec(consumers_all/1 ::
+      (vhost()) -> [{queue_name(), pid(), ctag(), boolean()}]).
 -spec(stat/1 :: (amqqueue()) -> qstats()).
 -spec(stat_all/0 :: () -> [qstats()]).
 -spec(delete/3 ::
@@ -95,7 +100,8 @@
 -spec(basic_get/3 :: (amqqueue(), pid(), boolean()) ->
              {'ok', non_neg_integer(), msg()} | 'empty').
 -spec(basic_consume/8 ::
-      (amqqueue(), boolean(), pid(), pid(), pid(), ctag(), boolean(), any()) ->
+      (amqqueue(), boolean(), pid(), pid(), pid() | 'undefined', ctag(),
+       boolean(), any()) ->
              'ok' | {'error', 'queue_owned_by_another_connection' |
                      'exclusive_consume_unavailable'}).
 -spec(basic_cancel/4 :: (amqqueue(), pid(), ctag(), any()) -> 'ok').
@@ -222,6 +228,8 @@ list(VHostPath) ->
       rabbit_queue,
       #amqqueue{name = rabbit_misc:r(VHostPath, queue), _ = '_'}).
 
+info_keys() -> rabbit_amqqueue_process:info_keys().
+
 map(VHostPath, F) -> rabbit_misc:filter_exit_map(F, list(VHostPath)).
 
 info(#amqqueue{ pid = QPid }) ->
@@ -237,6 +245,16 @@ info_all(VHostPath) -> map(VHostPath, fun (Q) -> info(Q) end).
 
 info_all(VHostPath, Items) -> map(VHostPath, fun (Q) -> info(Q, Items) end).
 
+consumers(#amqqueue{ pid = QPid }) ->
+    gen_server2:pcall(QPid, 9, consumers, infinity).
+
+consumers_all(VHostPath) ->
+    lists:concat(
+      map(VHostPath,
+          fun (Q) -> [{Q#amqqueue.name, ChPid, ConsumerTag, AckRequired} ||
+                         {ChPid, ConsumerTag, AckRequired} <- consumers(Q)]
+          end)).
+
 stat(#amqqueue{pid = QPid}) -> gen_server2:call(QPid, stat, infinity).
 
 stat_all() ->
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index a3b0814cfa..e4791f9524 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -39,7 +39,7 @@
 -define(HIBERNATE_AFTER_MIN, 1000).
 -define(DESIRED_HIBERNATE, 10000).
 
--export([start_link/1]).
+-export([start_link/1, info_keys/0]).
 
 -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]).
 
@@ -77,6 +77,9 @@
          auto_delete,
          arguments,
          pid,
+         owner_pid,
+         exclusive_consumer_pid,
+         exclusive_consumer_tag,
          messages_ready,
          messages_unacknowledged,
          messages_uncommitted,
@@ -88,9 +91,10 @@
 
 %%----------------------------------------------------------------------------
 
-start_link(Q) ->
-    gen_server2:start_link(?MODULE, Q, []).
+start_link(Q) -> gen_server2:start_link(?MODULE, Q, []).
 
+info_keys() -> ?INFO_KEYS.
+    
 %%----------------------------------------------------------------------------
 
 init(Q) ->
@@ -167,12 +171,11 @@ record_current_channel_tx(ChPid, Txn) ->
     %% that wasn't happening already)
     store_ch_record((ch_record(ChPid))#cr{txn = Txn}).
 
-deliver_immediately(Message, Delivered,
+deliver_immediately(Message, IsDelivered,
                     State = #q{q = #amqqueue{name = QName},
                                active_consumers = ActiveConsumers,
                                blocked_consumers = BlockedConsumers,
                                next_msg_id = NextId}) ->
-    ?LOGDEBUG("AMQQUEUE ~p DELIVERY:~n~p~n", [QName, Message]),
     case queue:out(ActiveConsumers) of
         {{value, QEntry = {ChPid, #consumer{tag = ConsumerTag,
                                             ack_required = AckRequired}}},
@@ -184,7 +187,7 @@ deliver_immediately(Message, Delivered,
                 true ->
                     rabbit_channel:deliver(
                       ChPid, ConsumerTag, AckRequired,
-                      {QName, self(), NextId, Delivered, Message}),
+                      {QName, self(), NextId, IsDelivered, Message}),
                     NewUAM = case AckRequired of
                                  true  -> dict:store(NextId, Message, UAM);
                                  false -> UAM
@@ -215,7 +218,7 @@ deliver_immediately(Message, Delivered,
                                        ActiveConsumers,
                                        BlockedConsumers),
                     deliver_immediately(
-                      Message, Delivered,
+                      Message, IsDelivered,
                       State#q{active_consumers = NewActiveConsumers,
                               blocked_consumers = NewBlockedConsumers})
             end;
@@ -223,6 +226,26 @@ deliver_immediately(Message, Delivered,
             {not_offered, State}
     end.
 
+run_message_queue(State = #q{message_buffer = MessageBuffer}) ->
+    run_message_queue(MessageBuffer, State).
+
+run_message_queue(MessageBuffer, State) ->
+    case queue:out(MessageBuffer) of
+        {{value, {Message, IsDelivered}}, BufferTail} ->
+            case deliver_immediately(Message, IsDelivered, State) of
+                {offered, true, NewState} ->
+                    persist_delivery(qname(State), Message, IsDelivered),
+                    run_message_queue(BufferTail, NewState);
+                {offered, false, NewState} ->
+                    persist_auto_ack(qname(State), Message),
+                    run_message_queue(BufferTail, NewState);
+                {not_offered, NewState} ->
+                    NewState#q{message_buffer = MessageBuffer}
+            end;
+        {empty, _} ->
+            State#q{message_buffer = MessageBuffer}
+    end.
+
 attempt_delivery(none, _ChPid, Message, State) ->
     case deliver_immediately(Message, false, State) of
         {offered, false, State1} ->
@@ -250,8 +273,8 @@ deliver_or_enqueue(Txn, ChPid, Message, State) ->
     end.
 
 deliver_or_enqueue_n(Messages, State = #q{message_buffer = MessageBuffer}) ->
-    run_poke_burst(queue:join(MessageBuffer, queue:from_list(Messages)),
-                   State).
+    run_message_queue(queue:join(MessageBuffer, queue:from_list(Messages)),
+                      State).
 
 add_consumer(ChPid, Consumer, Queue) -> queue:in({ChPid, Consumer}, Queue).
 
@@ -285,7 +308,7 @@ possibly_unblock(State, ChPid, Update) ->
                                move_consumers(ChPid,
                                               State#q.blocked_consumers,
                                               State#q.active_consumers),
-                           run_poke_burst(
+                           run_message_queue(
                              State#q{active_consumers = NewActiveConsumers,
                                      blocked_consumers = NewBlockedConsumers})
             end
@@ -297,32 +320,32 @@ should_auto_delete(State) -> is_unused(State).
 
 handle_ch_down(DownPid, State = #q{exclusive_consumer = Holder}) ->
     case lookup_ch(DownPid) of
-        not_found -> {ok, State};
+        not_found ->
+            {ok, State};
         #cr{monitor_ref = MonitorRef, ch_pid = ChPid, txn = Txn,
             unacked_messages = UAM} ->
             erlang:demonitor(MonitorRef),
             erase({ch, ChPid}),
-            case Txn of
-                none -> ok;
-                _    -> ok = rollback_work(Txn, qname(State)),
-                        erase_tx(Txn)
-            end,
-            NewState =
-                deliver_or_enqueue_n(
-                  [{Message, true} ||
-                      {_Messsage_id, Message} <- dict:to_list(UAM)],
-                  State#q{
-                    exclusive_consumer = case Holder of
-                                             {ChPid, _} -> none;
-                                             Other -> Other
-                                         end,
-                    active_consumers = remove_consumers(
-                                         ChPid, State#q.active_consumers),
-                    blocked_consumers = remove_consumers(
-                                          ChPid, State#q.blocked_consumers)}),
-            case should_auto_delete(NewState) of
-                false -> {ok, NewState};
-                true  -> {stop, NewState}
+            State1 = State#q{
+                       exclusive_consumer = case Holder of
+                                                {ChPid, _} -> none;
+                                                Other      -> Other
+                                            end,
+                       active_consumers = remove_consumers(
+                                            ChPid, State#q.active_consumers),
+                       blocked_consumers = remove_consumers(
+                                             ChPid, State#q.blocked_consumers)},
+            case should_auto_delete(State1) of
+                true  -> {stop, State1};
+                false -> case Txn of
+                             none -> ok;
+                             _    -> ok = rollback_work(Txn, qname(State1)),
+                                     erase_tx(Txn)
+                         end,
+                         {ok, deliver_or_enqueue_n(
+                                [{Message, true} ||
+                                    {_MsgId, Message} <- dict:to_list(UAM)],
+                                State1)}
             end
     end.
 
@@ -345,26 +368,6 @@ check_exclusive_access(none, true, State) ->
         false -> in_use
     end.
 
-run_poke_burst(State = #q{message_buffer = MessageBuffer}) ->
-    run_poke_burst(MessageBuffer, State).
-
-run_poke_burst(MessageBuffer, State) ->
-    case queue:out(MessageBuffer) of
-        {{value, {Message, Delivered}}, BufferTail} ->
-            case deliver_immediately(Message, Delivered, State) of
-                {offered, true, NewState} ->
-                    persist_delivery(qname(State), Message, Delivered),
-                    run_poke_burst(BufferTail, NewState);
-                {offered, false, NewState} ->
-                    persist_auto_ack(qname(State), Message),
-                    run_poke_burst(BufferTail, NewState);
-                {not_offered, NewState} ->
-                    NewState#q{message_buffer = MessageBuffer}
-            end;
-        {empty, _} ->
-            State#q{message_buffer = MessageBuffer}
-    end.
-
 is_unused(State) -> queue:is_empty(State#q.active_consumers) andalso
                         queue:is_empty(State#q.blocked_consumers).
 
@@ -387,10 +390,10 @@ persist_delivery(_QName, _Message,
                  true) ->
     ok;
 persist_delivery(_QName, #basic_message{persistent_key = none},
-                 _Delivered) ->
+                 _IsDelivered) ->
     ok;
 persist_delivery(QName, #basic_message{persistent_key = PKey},
-                 _Delivered) ->
+                 _IsDelivered) ->
     persist_work(none, QName, [{deliver, {QName, PKey}}]).
 
 persist_acks(Txn, QName, Messages) ->
@@ -490,11 +493,11 @@ collect_messages(MsgIds, UAM) ->
 
 purge_message_buffer(QName, MessageBuffer) ->
     Messages =
-        [[Message || {Message, _Delivered} <-
+        [[Message || {Message, _IsDelivered} <-
                          queue:to_list(MessageBuffer)] |
          lists:map(
            fun (#cr{unacked_messages = UAM}) ->
-                   [Message || {_MessageId, Message} <- dict:to_list(UAM)]
+                   [Message || {_MsgId, Message} <- dict:to_list(UAM)]
            end,
            all_ch_record())],
     %% the simplest, though certainly not the most obvious or
@@ -510,6 +513,18 @@ i(auto_delete, #q{q = #amqqueue{auto_delete = AutoDelete}}) -> AutoDelete;
 i(arguments,   #q{q = #amqqueue{arguments   = Arguments}})  -> Arguments;
 i(pid, _) ->
     self();
+i(owner_pid, #q{owner = none}) ->
+    '';
+i(owner_pid, #q{owner = {ReaderPid, _MonitorRef}}) ->
+    ReaderPid;
+i(exclusive_consumer_pid, #q{exclusive_consumer = none}) ->
+    '';
+i(exclusive_consumer_pid, #q{exclusive_consumer = {ChPid, _ConsumerTag}}) ->
+    ChPid;
+i(exclusive_consumer_tag, #q{exclusive_consumer = none}) ->
+    '';
+i(exclusive_consumer_tag, #q{exclusive_consumer = {_ChPid, ConsumerTag}}) ->
+    ConsumerTag;
 i(messages_ready, #q{message_buffer = MessageBuffer}) ->
     queue:len(MessageBuffer);
 i(messages_unacknowledged, _) ->
@@ -546,6 +561,15 @@ handle_call({info, Items}, _From, State) ->
     catch Error -> reply({error, Error}, State)
     end;
 
+handle_call(consumers, _From,
+            State = #q{active_consumers = ActiveConsumers,
+                       blocked_consumers = BlockedConsumers}) ->
+    reply(rabbit_misc:queue_fold(
+            fun ({ChPid, #consumer{tag = ConsumerTag,
+                                   ack_required = AckRequired}}, Acc) ->
+                    [{ChPid, ConsumerTag, AckRequired} | Acc]
+            end, [], queue:join(ActiveConsumers, BlockedConsumers)), State);
+
 handle_call({deliver_immediately, Txn, Message, ChPid}, _From, State) ->
     %% Synchronous, "immediate" delivery mode
     %%
@@ -592,18 +616,18 @@ handle_call({basic_get, ChPid, NoAck}, _From,
                        next_msg_id = NextId,
                        message_buffer = MessageBuffer}) ->
     case queue:out(MessageBuffer) of
-        {{value, {Message, Delivered}}, BufferTail} ->
+        {{value, {Message, IsDelivered}}, BufferTail} ->
             AckRequired = not(NoAck),
             case AckRequired of
                 true  ->
-                    persist_delivery(QName, Message, Delivered),
+                    persist_delivery(QName, Message, IsDelivered),
                     C = #cr{unacked_messages = UAM} = ch_record(ChPid),
                     NewUAM = dict:store(NextId, Message, UAM),
                     store_ch_record(C#cr{unacked_messages = NewUAM});
                 false ->
                     persist_auto_ack(QName, Message)
             end,
-            Msg = {QName, self(), NextId, Delivered, Message},
+            Msg = {QName, self(), NextId, IsDelivered, Message},
             reply({ok, queue:len(BufferTail), Msg},
                   State#q{message_buffer = BufferTail,
                           next_msg_id = NextId + 1});
@@ -629,15 +653,14 @@ handle_call({basic_consume, NoAck, ReaderPid, ChPid, LimiterPid,
                                          ack_required = not(NoAck)},
                     store_ch_record(C#cr{consumer_count = ConsumerCount +1,
                                          limiter_pid = LimiterPid}),
-                    if ConsumerCount == 0 ->
-                            ok = rabbit_limiter:register(LimiterPid, self());
-                       true ->
-                            ok
+                    case ConsumerCount of
+                        0 -> ok = rabbit_limiter:register(LimiterPid, self());
+                        _ -> ok
                     end,
-                    ExclusiveConsumer =
-                        if ExclusiveConsume -> {ChPid, ConsumerTag};
-                           true             -> ExistingHolder
-                        end,
+                    ExclusiveConsumer = case ExclusiveConsume of
+                                            true  -> {ChPid, ConsumerTag};
+                                            false -> ExistingHolder
+                                        end,
                     State1 = State#q{has_had_consumers = true,
                                      exclusive_consumer = ExclusiveConsumer},
                     ok = maybe_send_reply(ChPid, OkMsg),
@@ -648,7 +671,7 @@ handle_call({basic_consume, NoAck, ReaderPid, ChPid, LimiterPid,
                                        add_consumer(
                                          ChPid, Consumer,
                                          State1#q.blocked_consumers)};
-                            false -> run_poke_burst(
+                            false -> run_message_queue(
                                        State1#q{
                                          active_consumers =
                                          add_consumer(
@@ -667,10 +690,9 @@ handle_call({basic_cancel, ChPid, ConsumerTag, OkMsg}, _From,
             reply(ok, State);
         C = #cr{consumer_count = ConsumerCount, limiter_pid = LimiterPid} ->
             store_ch_record(C#cr{consumer_count = ConsumerCount - 1}),
-            if ConsumerCount == 1 ->
-                    ok = rabbit_limiter:unregister(LimiterPid, self());
-               true ->
-                    ok
+            case ConsumerCount of
+                1 -> ok = rabbit_limiter:unregister(LimiterPid, self());
+                _ -> ok
             end,
             ok = maybe_send_reply(ChPid, OkMsg),
             NewState =
@@ -692,8 +714,8 @@ handle_call({basic_cancel, ChPid, ConsumerTag, OkMsg}, _From,
 handle_call(stat, _From, State = #q{q = #amqqueue{name = Name},
                                     message_buffer = MessageBuffer,
                                     active_consumers = ActiveConsumers}) ->
-    reply({ok, Name, queue:len(MessageBuffer), queue:len(ActiveConsumers)},
-          State);
+    Length = queue:len(MessageBuffer),
+    reply({ok, Name, Length, queue:len(ActiveConsumers)}, State);
 
 handle_call({delete, IfUnused, IfEmpty}, _From,
             State = #q{message_buffer = MessageBuffer}) ->
@@ -713,8 +735,8 @@ handle_call(purge, _From, State = #q{message_buffer = MessageBuffer}) ->
     reply({ok, queue:len(MessageBuffer)},
           State#q{message_buffer = queue:new()});
 
-handle_call({claim_queue, ReaderPid}, _From, State = #q{owner = Owner,
-                                                        exclusive_consumer = Holder}) ->
+handle_call({claim_queue, ReaderPid}, _From,
+            State = #q{owner = Owner, exclusive_consumer = Holder}) ->
     case Owner of
         none ->
             case check_exclusive_access(Holder, true, State) of
@@ -727,7 +749,8 @@ handle_call({claim_queue, ReaderPid}, _From, State = #q{owner = Owner,
                     %% pid...
                     reply(locked, State);
                 ok ->
-                    reply(ok, State#q{owner = {ReaderPid, erlang:monitor(process, ReaderPid)}})
+                    MonitorRef = erlang:monitor(process, ReaderPid),
+                    reply(ok, State#q{owner = {ReaderPid, MonitorRef}})
             end;
         {ReaderPid, _MonitorRef} ->
             reply(ok, State);
diff --git a/src/rabbit_amqqueue_sup.erl b/src/rabbit_amqqueue_sup.erl
index 46d23a4075..0f3a86646a 100644
--- a/src/rabbit_amqqueue_sup.erl
+++ b/src/rabbit_amqqueue_sup.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 341aa7d0ed..9ebb6e72e0 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl
index b8e161a6bd..1d47d7640e 100644
--- a/src/rabbit_binary_generator.erl
+++ b/src/rabbit_binary_generator.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -196,12 +196,16 @@ generate_array(Array) when is_list(Array) ->
                      fun ({Type, Value}) -> field_value_to_binary(Type, Value) end,
                      Array)).
 
-short_string_to_binary(String) when is_binary(String) and (size(String) < 256) ->
-    [<<(size(String)):8>>, String];
+short_string_to_binary(String) when is_binary(String) ->
+    Len = size(String),
+    if Len < 256 -> [<<(size(String)):8>>, String];
+       true      -> exit(content_properties_shortstr_overflow)
+    end;
 short_string_to_binary(String) ->
     StringLength = length(String),
-    true = (StringLength < 256), % assertion
-    [<<StringLength:8>>, String].
+    if StringLength < 256 -> [<<StringLength:8>>, String];
+       true               -> exit(content_properties_shortstr_overflow)
+    end.
 
 long_string_to_binary(String) when is_binary(String) ->
     [<<(size(String)):32>>, String];
@@ -239,7 +243,10 @@ encode_properties(Bit, [T | TypeList], [Value | ValueList], FirstShortAcc, Flags
     end.
 
 encode_property(shortstr, String) ->
-    Len = size(String), <<Len:8/unsigned, String:Len/binary>>;
+    Len = size(String),
+    if Len < 256 -> <<Len:8/unsigned, String:Len/binary>>;
+       true      -> exit(content_properties_shortstr_overflow)
+    end;
 encode_property(longstr, String) ->
     Len = size(String), <<Len:32/unsigned, String:Len/binary>>;
 encode_property(octet, Int) ->
diff --git a/src/rabbit_binary_parser.erl b/src/rabbit_binary_parser.erl
index eaedeba12c..e022a1fafe 100644
--- a/src/rabbit_binary_parser.erl
+++ b/src/rabbit_binary_parser.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 94d061483f..db4ba1ed18 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -37,8 +37,10 @@
 
 -export([start_link/5, do/2, do/3, shutdown/1]).
 -export([send_command/2, deliver/4, conserve_memory/2]).
+-export([list/0, info_keys/0, info/1, info/2, info_all/0, info_all/1]).
 
--export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]).
+-export([init/1, terminate/2, code_change/3,
+         handle_call/3, handle_cast/2, handle_info/2, handle_pre_hibernate/1]).
 
 -record(ch, {state, channel, reader_pid, writer_pid, limiter_pid,
              transaction_id, tx_participants, next_tag,
@@ -46,10 +48,23 @@
              username, virtual_host,
              most_recently_declared_queue, consumer_mapping}).
 
--define(HIBERNATE_AFTER, 1000).
+-define(HIBERNATE_AFTER_MIN, 1000).
+-define(DESIRED_HIBERNATE, 10000).
 
 -define(MAX_PERMISSION_CACHE_SIZE, 12).
 
+-define(INFO_KEYS,
+        [pid,
+         connection,
+         number,
+         user,
+         vhost,
+         transactional,
+         consumer_count,
+         messages_unacknowledged,
+         acks_uncommitted,
+         prefetch_count]).
+
 %%----------------------------------------------------------------------------
 
 -ifdef(use_specs).
@@ -62,6 +77,12 @@
 -spec(send_command/2 :: (pid(), amqp_method()) -> 'ok').
 -spec(deliver/4 :: (pid(), ctag(), boolean(), msg()) -> 'ok').
 -spec(conserve_memory/2 :: (pid(), boolean()) -> 'ok').
+-spec(list/0 :: () -> [pid()]).
+-spec(info_keys/0 :: () -> [info_key()]).
+-spec(info/1 :: (pid()) -> [info()]).
+-spec(info/2 :: (pid(), [info_key()]) -> [info()]).
+-spec(info_all/0 :: () -> [[info()]]).
+-spec(info_all/1 :: ([info_key()]) -> [[info()]]).
 
 -endif.
 
@@ -91,12 +112,33 @@ deliver(Pid, ConsumerTag, AckRequired, Msg) ->
 conserve_memory(Pid, Conserve) ->
     gen_server2:pcast(Pid, 9, {conserve_memory, Conserve}).
 
+list() ->
+    pg_local:get_members(rabbit_channels).
+
+info_keys() -> ?INFO_KEYS.
+
+info(Pid) ->
+    gen_server2:pcall(Pid, 9, info, infinity).
+
+info(Pid, Items) ->
+    case gen_server2:pcall(Pid, 9, {info, Items}, infinity) of
+        {ok, Res}      -> Res;
+        {error, Error} -> throw(Error)
+    end.
+
+info_all() ->
+    rabbit_misc:filter_exit_map(fun (C) -> info(C) end, list()).
+
+info_all(Items) ->
+    rabbit_misc:filter_exit_map(fun (C) -> info(C, Items) end, list()).
+
 %%---------------------------------------------------------------------------
 
 init([Channel, ReaderPid, WriterPid, Username, VHost]) ->
     process_flag(trap_exit, true),
     link(WriterPid),
     rabbit_alarm:register(self(), {?MODULE, conserve_memory, []}),
+    ok = pg_local:join(rabbit_channels, self()),
     {ok, #ch{state                   = starting,
              channel                 = Channel,
              reader_pid              = ReaderPid,
@@ -110,7 +152,18 @@ init([Channel, ReaderPid, WriterPid, Username, VHost]) ->
              username                = Username,
              virtual_host            = VHost,
              most_recently_declared_queue = <<>>,
-             consumer_mapping        = dict:new()}}.
+             consumer_mapping        = dict:new()},
+     hibernate,
+     {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}.
+
+handle_call(info, _From, State) ->
+    reply(infos(?INFO_KEYS, State), State);
+
+handle_call({info, Items}, _From, State) ->
+    try
+        reply({ok, infos(Items, State)}, State)
+    catch Error -> reply({error, Error}, State)
+    end;
 
 handle_call(_Request, _From, State) ->
     noreply(State).
@@ -162,33 +215,31 @@ handle_info({'EXIT', WriterPid, Reason = {writer, send_failed, _Error}},
     State#ch.reader_pid ! {channel_exit, State#ch.channel, Reason},
     {stop, normal, State};
 handle_info({'EXIT', _Pid, Reason}, State) ->
-    {stop, Reason, State};
+    {stop, Reason, State}.
 
-handle_info(timeout, State) ->
+handle_pre_hibernate(State) ->
     ok = clear_permission_cache(),
-    {noreply, State, hibernate}.
+    {hibernate, State}.
 
-terminate(_Reason, #ch{writer_pid = WriterPid, limiter_pid = LimiterPid,
-                       state = terminating}) ->
-    rabbit_writer:shutdown(WriterPid),
-    rabbit_limiter:shutdown(LimiterPid);
+terminate(_Reason, State = #ch{state = terminating}) ->
+    terminate(State);
 
-terminate(Reason, State = #ch{writer_pid = WriterPid,
-                              limiter_pid = LimiterPid}) ->
+terminate(Reason, State) ->
     Res = rollback_and_notify(State),
     case Reason of
         normal -> ok = Res;
         _      -> ok
     end,
-    rabbit_writer:shutdown(WriterPid),
-    rabbit_limiter:shutdown(LimiterPid).
+    terminate(State).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
 %%---------------------------------------------------------------------------
 
-noreply(NewState) -> {noreply, NewState, ?HIBERNATE_AFTER}.
+reply(Reply, NewState) -> {reply, Reply, NewState, hibernate}.
+
+noreply(NewState) -> {noreply, NewState, hibernate}.
 
 return_ok(State, true, _Msg)  -> {noreply, State};
 return_ok(State, false, Msg)  -> {reply, Msg, State}.
@@ -489,12 +540,14 @@ handle_method(#'basic.qos'{prefetch_size = Size}, _, _State) when Size /= 0 ->
                                "prefetch_size!=0 (~w)", [Size]);
 
 handle_method(#'basic.qos'{prefetch_count = PrefetchCount},
-              _, State = #ch{ limiter_pid = LimiterPid }) ->
+              _, State = #ch{ limiter_pid = LimiterPid,
+                              unacked_message_q = UAMQ }) ->
     NewLimiterPid = case {LimiterPid, PrefetchCount} of
                         {undefined, 0} ->
                             undefined;
                         {undefined, _} ->
-                            LPid = rabbit_limiter:start_link(self()),
+                            LPid = rabbit_limiter:start_link(self(),
+                                                             queue:len(UAMQ)),
                             ok = limit_queues(LPid, State),
                             LPid;
                         {_, 0} ->
@@ -951,3 +1004,28 @@ internal_deliver(WriterPid, Notify, ConsumerTag, DeliveryTag,
                         WriterPid, QPid, self(), M, Content);
              false -> rabbit_writer:send_command(WriterPid, M, Content)
          end.
+
+terminate(#ch{writer_pid = WriterPid, limiter_pid = LimiterPid}) ->
+    pg_local:leave(rabbit_channels, self()),
+    rabbit_writer:shutdown(WriterPid),
+    rabbit_limiter:shutdown(LimiterPid).
+
+infos(Items, State) -> [{Item, i(Item, State)} || Item <- Items].
+
+i(pid,            _)                                 -> self();
+i(connection,     #ch{reader_pid       = ReaderPid}) -> ReaderPid;
+i(number,         #ch{channel          = Channel})   -> Channel;
+i(user,           #ch{username         = Username})  -> Username;
+i(vhost,          #ch{virtual_host     = VHost})     -> VHost;
+i(transactional,  #ch{transaction_id   = TxnKey})    -> TxnKey =/= none;
+i(consumer_count, #ch{consumer_mapping = ConsumerMapping}) ->
+    dict:size(ConsumerMapping);
+i(messages_unacknowledged, #ch{unacked_message_q = UAMQ,
+                               uncommitted_ack_q = UAQ}) ->
+    queue:len(UAMQ) + queue:len(UAQ);
+i(acks_uncommitted, #ch{uncommitted_ack_q = UAQ}) ->
+    queue:len(UAQ);
+i(prefetch_count, #ch{limiter_pid = LimiterPid}) ->
+    rabbit_limiter:get_limit(LimiterPid);
+i(Item, _) ->
+    throw({bad_argument, Item}).
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 2fe3f33e09..6aac442888 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -81,6 +81,9 @@ start() ->
         {error, Reason} ->
             error("~p", [Reason]),
             halt(2);
+        {badrpc, {'EXIT', Reason}} ->
+            error("~p", [Reason]),
+            halt(2);
         {badrpc, Reason} ->
             error("unable to connect to node ~w: ~w", [Node, Reason]),
             print_badrpc_diagnostics(Node),
@@ -139,6 +142,7 @@ Available commands:
   cluster <ClusterNode> ...
   status
   rotate_logs [Suffix]
+  close_connection <ConnectionPid> <ExplanationString>
 
   add_user        <UserName> <Password>
   delete_user     <UserName>
@@ -158,6 +162,8 @@ Available commands:
   list_exchanges [-p <VHostPath>] [<ExchangeInfoItem> ...]
   list_bindings  [-p <VHostPath>]
   list_connections [<ConnectionInfoItem> ...]
+  list_channels [<ChannelInfoItem> ...]
+  list_consumers [-p <VHostPath>]
 
 Quiet output mode is selected with the \"-q\" flag. Informational
 messages are suppressed when quiet mode is in effect.
@@ -174,7 +180,8 @@ optional virtual host parameter for which to display results. The
 default value is \"/\".
 
 <QueueInfoItem> must be a member of the list [name, durable,
-auto_delete, arguments, pid, messages_ready, messages_unacknowledged,
+auto_delete, arguments, pid, owner_pid, exclusive_consumer_pid,
+exclusive_consumer_tag, messages_ready, messages_unacknowledged,
 messages_uncommitted, messages, acks_uncommitted, consumers,
 transactions, memory]. The default is to display name and (number of)
 messages.
@@ -191,6 +198,17 @@ frame_max, client_properties, recv_oct, recv_cnt, send_oct, send_cnt,
 send_pend].  The default is to display user, peer_address, peer_port
 and state.
 
+<ChannelInfoItem> must be a member of the list [pid, connection,
+number, user, vhost, transactional, consumer_count,
+messages_unacknowledged, acks_uncommitted, prefetch_count]. The
+default is to display pid, user, transactional, consumer_count,
+messages_unacknowledged.
+
+The output format for \"list_consumers\" is a list of rows containing,
+in order, the queue name, channel process id, consumer tag, and a
+boolean indicating whether acknowledgements are expected from the
+consumer.
+
 "),
     halt(1).
 
@@ -235,6 +253,11 @@ action(rotate_logs, Node, Args = [Suffix], Inform) ->
     Inform("Rotating logs to files with suffix ~p", [Suffix]),
     call(Node, {rabbit, rotate_logs, Args});
 
+action(close_connection, Node, [PidStr, Explanation], Inform) ->
+    Inform("Closing connection ~s", [PidStr]),
+    rpc_call(Node, rabbit_networking, close_connection,
+             [rabbit_misc:string_to_pid(PidStr), Explanation]);
+
 action(add_user, Node, Args = [Username, _Password], Inform) ->
     Inform("Creating user ~p", [Username]),
     call(Node, {rabbit_access_control, add_user, Args});
@@ -291,8 +314,7 @@ action(list_bindings, Node, Args, Inform) ->
     display_info_list(
       [lists:zip(InfoKeys, tuple_to_list(X)) ||
           X <- rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])],
-      InfoKeys),
-    ok;
+      InfoKeys);
 
 action(list_connections, Node, Args, Inform) ->
     Inform("Listing connections", []),
@@ -301,6 +323,22 @@ action(list_connections, Node, Args, Inform) ->
                                [ArgAtoms]),
                       ArgAtoms);
 
+action(list_channels, Node, Args, Inform) ->
+    Inform("Listing channels", []),
+    ArgAtoms = default_if_empty(Args, [pid, user, transactional, consumer_count,
+                                       messages_unacknowledged]),
+    display_info_list(rpc_call(Node, rabbit_channel, info_all, [ArgAtoms]),
+                      ArgAtoms);
+
+action(list_consumers, Node, Args, Inform) ->
+    Inform("Listing consumers", []),
+    {VHostArg, _} = parse_vhost_flag_bin(Args),
+    InfoKeys = [queue_name, channel_pid, consumer_tag, ack_required],
+    display_info_list(
+      [lists:zip(InfoKeys, tuple_to_list(X)) ||
+          X <- rpc_call(Node, rabbit_amqqueue, consumers_all, [VHostArg])],
+      InfoKeys);
+
 action(Command, Node, Args, Inform) ->
     {VHost, RemainingArgs} = parse_vhost_flag(Args),
     action(Command, Node, VHost, RemainingArgs, Inform).
@@ -358,7 +396,7 @@ format_info_item(Key, Items) ->
                    is_tuple(Value) ->
             inet_parse:ntoa(Value);
         Value when is_pid(Value) ->
-            pid_to_string(Value);
+            rabbit_misc:pid_to_string(Value);
         Value when is_binary(Value) ->
             escape(Value);
         Value when is_atom(Value) ->
@@ -416,10 +454,3 @@ prettify_typed_amqp_value(Type, Value) ->
         array   -> [prettify_typed_amqp_value(T, V) || {T, V} <- Value];
         _       -> Value
     end.
-
-%% see http://erlang.org/doc/apps/erts/erl_ext_dist.html (8.10 and 8.7)
-pid_to_string(Pid) ->
-    <<131,103,100,NodeLen:16,NodeBin:NodeLen/binary,Id:32,Ser:32,_Cre:8>>
-        = term_to_binary(Pid),
-    Node = binary_to_term(<<131,100,NodeLen:16,NodeBin:NodeLen/binary>>),
-    lists:flatten(io_lib:format("<~w.~B.~B>", [Node, Id, Ser])).
diff --git a/src/rabbit_dialyzer.erl b/src/rabbit_dialyzer.erl
index 23e6fc4432..078cf620f4 100644
--- a/src/rabbit_dialyzer.erl
+++ b/src/rabbit_dialyzer.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl
index b9bd71b78d..e9baf2c480 100644
--- a/src/rabbit_error_logger.erl
+++ b/src/rabbit_error_logger.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl
index 3ad85923c5..45b66712b8 100644
--- a/src/rabbit_error_logger_file_h.erl
+++ b/src/rabbit_error_logger_file_h.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 29451fc9af..151101315c 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -34,7 +34,7 @@
 -include("rabbit_framing.hrl").
 
 -export([recover/0, declare/5, lookup/1, lookup_or_die/1,
-         list/1, info/1, info/2, info_all/1, info_all/2,
+         list/1, info_keys/0, info/1, info/2, info_all/1, info_all/2,
          publish/2]).
 -export([add_binding/4, delete_binding/4, list_bindings/1]).
 -export([delete/2]).
@@ -66,6 +66,7 @@
 -spec(lookup/1 :: (exchange_name()) -> {'ok', exchange()} | not_found()).
 -spec(lookup_or_die/1 :: (exchange_name()) -> exchange()).
 -spec(list/1 :: (vhost()) -> [exchange()]).
+-spec(info_keys/0 :: () -> [info_key()]).
 -spec(info/1 :: (exchange()) -> [info()]).
 -spec(info/2 :: (exchange(), [info_key()]) -> [info()]).
 -spec(info_all/1 :: (vhost()) -> [[info()]]).
@@ -205,6 +206,8 @@ list(VHostPath) ->
       rabbit_exchange,
       #exchange{name = rabbit_misc:r(VHostPath, exchange), _ = '_'}).
 
+info_keys() -> ?INFO_KEYS.
+
 map(VHostPath, F) ->
     %% TODO: there is scope for optimisation here, e.g. using a
     %% cursor, parallelising the function invocation
diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl
index 3bde08799b..b7c6aa96fa 100644
--- a/src/rabbit_framing_channel.erl
+++ b/src/rabbit_framing_channel.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl
index ea61a679e8..2fa531a7ce 100644
--- a/src/rabbit_guid.erl
+++ b/src/rabbit_guid.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_heartbeat.erl b/src/rabbit_heartbeat.erl
index ed0066fe07..4556570567 100644
--- a/src/rabbit_heartbeat.erl
+++ b/src/rabbit_heartbeat.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_hooks.erl b/src/rabbit_hooks.erl
index 3faeec2670..3fc84c1e09 100644
--- a/src/rabbit_hooks.erl
+++ b/src/rabbit_hooks.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 087a9f64d9..c9f8183fc9 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -31,12 +31,13 @@
 
 -module(rabbit_limiter).
 
--behaviour(gen_server).
+-behaviour(gen_server2).
 
 -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2,
          handle_info/2]).
--export([start_link/1, shutdown/1]).
+-export([start_link/2, shutdown/1]).
 -export([limit/2, can_send/3, ack/2, register/2, unregister/2]).
+-export([get_limit/1]).
 
 %%----------------------------------------------------------------------------
 
@@ -44,13 +45,14 @@
 
 -type(maybe_pid() :: pid() | 'undefined').
 
--spec(start_link/1 :: (pid()) -> pid()).
+-spec(start_link/2 :: (pid(), non_neg_integer()) -> pid()).
 -spec(shutdown/1 :: (maybe_pid()) -> 'ok').
 -spec(limit/2 :: (maybe_pid(), non_neg_integer()) -> 'ok').
 -spec(can_send/3 :: (maybe_pid(), pid(), boolean()) -> boolean()).
 -spec(ack/2 :: (maybe_pid(), non_neg_integer()) -> 'ok').
 -spec(register/2 :: (maybe_pid(), pid()) -> 'ok').
 -spec(unregister/2 :: (maybe_pid(), pid()) -> 'ok').
+-spec(get_limit/1 :: (maybe_pid()) -> non_neg_integer()).
 
 -endif.
 
@@ -68,8 +70,8 @@
 %% API
 %%----------------------------------------------------------------------------
 
-start_link(ChPid) ->
-    {ok, Pid} = gen_server:start_link(?MODULE, [ChPid], []),
+start_link(ChPid, UnackedMsgCount) ->
+    {ok, Pid} = gen_server2:start_link(?MODULE, [ChPid, UnackedMsgCount], []),
     Pid.
 
 shutdown(undefined) ->
@@ -104,12 +106,19 @@ register(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {register, QPid}).
 unregister(undefined, _QPid) -> ok;
 unregister(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {unregister, QPid}).
 
+get_limit(undefined) ->
+    0;
+get_limit(Pid) ->
+    rabbit_misc:with_exit_handler(
+      fun () -> 0 end,
+      fun () -> gen_server2:pcall(Pid, 9, get_limit, infinity) end).
+
 %%----------------------------------------------------------------------------
 %% gen_server callbacks
 %%----------------------------------------------------------------------------
 
-init([ChPid]) ->
-    {ok, #lim{ch_pid = ChPid} }.
+init([ChPid, UnackedMsgCount]) ->
+    {ok, #lim{ch_pid = ChPid, volume = UnackedMsgCount}}.
 
 handle_call({can_send, QPid, AckRequired}, _From,
             State = #lim{volume = Volume}) ->
@@ -118,7 +127,10 @@ handle_call({can_send, QPid, AckRequired}, _From,
         false -> {reply, true, State#lim{volume = if AckRequired -> Volume + 1;
                                                      true        -> Volume
                                                   end}}
-    end.
+    end;
+
+handle_call(get_limit, _From, State = #lim{prefetch_count = PrefetchCount}) ->
+    {reply, PrefetchCount, State}.
 
 handle_cast(shutdown, State) ->
     {stop, normal, State};
diff --git a/src/rabbit_load.erl b/src/rabbit_load.erl
index 6ef638cb59..4f467162e4 100644
--- a/src/rabbit_load.erl
+++ b/src/rabbit_load.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl
index dd5b498b07..cc80e360ae 100644
--- a/src/rabbit_log.erl
+++ b/src/rabbit_log.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index bccee2a70f..9abc1695ae 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -57,6 +57,8 @@
 -export([start_applications/1, stop_applications/1]).
 -export([unfold/2, ceil/1, queue_fold/3]).
 -export([sort_field_table/1]).
+-export([pid_to_string/1, string_to_pid/1]).
+-export([version_compare/2, version_compare/3]).
 
 -import(mnesia).
 -import(lists).
@@ -129,6 +131,8 @@
 -spec(ceil/1 :: (number()) -> number()).
 -spec(queue_fold/3 :: (fun ((any(), B) -> B), B, queue()) -> B).
 -spec(sort_field_table/1 :: (amqp_table()) -> amqp_table()).
+-spec(pid_to_string/1 :: (pid()) -> string()).
+-spec(string_to_pid/1 :: (string()) -> pid()).
 
 -endif.
 
@@ -505,3 +509,95 @@ queue_fold(Fun, Init, Q) ->
 %% Sorts a list of AMQP table fields as per the AMQP spec
 sort_field_table(Arguments) ->
     lists:keysort(1, Arguments).
+
+%% This provides a string representation of a pid that is the same
+%% regardless of what node we are running on. The representation also
+%% permits easy identification of the pid's node.
+pid_to_string(Pid) when is_pid(Pid) ->
+    %% see http://erlang.org/doc/apps/erts/erl_ext_dist.html (8.10 and
+    %% 8.7)
+    <<131,103,100,NodeLen:16,NodeBin:NodeLen/binary,Id:32,Ser:32,_Cre:8>>
+        = term_to_binary(Pid),
+    Node = binary_to_term(<<131,100,NodeLen:16,NodeBin:NodeLen/binary>>),
+    lists:flatten(io_lib:format("<~w.~B.~B>", [Node, Id, Ser])).
+
+%% inverse of above
+string_to_pid(Str) ->
+    ErrorFun = fun () -> throw({error, {invalid_pid_syntax, Str}}) end,
+    %% TODO: simplify this code by using the 're' module, once we drop
+    %% support for R11
+    %%
+    %% 1) sanity check
+    %% The \ before the trailing $ is only there to keep emacs
+    %% font-lock from getting confused.
+    case regexp:first_match(Str, "^<.*\\.[0-9]+\\.[0-9]+>\$") of
+        {match, _, _} ->
+            %% 2) strip <>
+            Str1 = string:substr(Str, 2, string:len(Str) - 2),
+            %% 3) extract three constituent parts, taking care to
+            %% handle dots in the node part (hence the reverse and concat)
+            [SerStr, IdStr | Rest] = lists:reverse(string:tokens(Str1, ".")),
+            NodeStr = lists:concat(lists:reverse(Rest)),
+            %% 4) construct a triple term from the three parts
+            TripleStr = lists:flatten(io_lib:format("{~s,~s,~s}.",
+                                                    [NodeStr, IdStr, SerStr])),
+            %% 5) parse the triple
+            Tokens = case erl_scan:string(TripleStr) of
+                         {ok, Tokens1, _} -> Tokens1;
+                         {error, _, _}    -> ErrorFun()
+                     end,
+            Term = case erl_parse:parse_term(Tokens) of
+                       {ok, Term1} -> Term1;
+                       {error, _}  -> ErrorFun()
+                   end,
+            {Node, Id, Ser} =
+                case Term of
+                    {Node1, Id1, Ser1} when is_atom(Node1) andalso
+                                            is_integer(Id1) andalso
+                                            is_integer(Ser1) ->
+                        Term;
+                    _ ->
+                        ErrorFun()
+                end,
+            %% 6) turn the triple into a pid - see pid_to_string
+            <<131,NodeEnc/binary>> = term_to_binary(Node),
+            binary_to_term(<<131,103,NodeEnc/binary,Id:32,Ser:32,0:8>>);
+        nomatch ->
+            ErrorFun();
+        Error ->
+            %% invalid regexp - shouldn't happen
+            throw(Error)
+    end.
+
+version_compare(A, B, lte) ->
+    case version_compare(A, B) of
+        eq -> true;
+        lt -> true;
+        gt -> false
+    end;
+version_compare(A, B, gte) ->
+    case version_compare(A, B) of
+        eq -> true;
+        gt -> true;
+        lt -> false
+    end;
+version_compare(A, B, Result) ->
+    Result =:= version_compare(A, B).
+
+version_compare([], []) ->
+    eq;
+version_compare([], _ ) ->
+    lt; %% 2.3 < 2.3.1
+version_compare(_ , []) ->
+    gt; %% 2.3.1 > 2.3
+version_compare(A,  B) ->
+    {AStr, ATl} = lists:splitwith(fun (X) -> X =/= $. end, A),
+    {BStr, BTl} = lists:splitwith(fun (X) -> X =/= $. end, B),
+    ANum = list_to_integer(AStr),
+    BNum = list_to_integer(BStr),
+    if ANum =:= BNum -> ATl1 = lists:dropwhile(fun (X) -> X =:= $. end, ATl),
+                        BTl1 = lists:dropwhile(fun (X) -> X =:= $. end, BTl),
+                        version_compare(ATl1, BTl1);
+       ANum < BNum   -> lt;
+       ANum > BNum   -> gt
+    end.
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 1e700362c6..6ec3cf74b3 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index dc642df403..8c898498e6 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -187,7 +187,7 @@ start_node(Node, RpcTimeout) ->
     io:format("Starting node ~s...~n", [Node]),
     case rpc:call(Node, os, getpid, []) of
         {badrpc, _} ->
-            Port = run_cmd(script_filename()),
+            Port = run_rabbitmq_server(),
             Started = wait_for_rabbit_to_start(Node, RpcTimeout, Port),
             Pid = case rpc:call(Node, os, getpid, []) of
                       {badrpc, _} -> throw(cannot_get_pid);
@@ -217,8 +217,21 @@ wait_for_rabbit_to_start(Node, RpcTimeout, Port) ->
                  end
     end.
 
-run_cmd(FullPath) ->
-    erlang:open_port({spawn, FullPath}, [nouse_stdio]).
+run_rabbitmq_server() ->
+    with_os([{unix, fun run_rabbitmq_server_unix/0},
+             {win32, fun run_rabbitmq_server_win32/0}]).
+
+run_rabbitmq_server_unix() ->
+    CmdLine = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server -noinput",
+    erlang:open_port({spawn, CmdLine}, [nouse_stdio]).
+
+run_rabbitmq_server_win32() ->
+    Cmd = filename:nativename(os:find_executable("cmd")),
+    CmdLine = "\"" ++ getenv("RABBITMQ_SCRIPT_HOME")
+                                         ++ "\\rabbitmq-server.bat\" -noinput",
+    erlang:open_port({spawn_executable, Cmd},
+                     [{arg0, Cmd}, {args, ["/q", "/s", "/c", CmdLine]},
+                      nouse_stdio, hide]).
 
 is_rabbit_running(Node, RpcTimeout) ->
     case rpc:call(Node, rabbit, status, [], RpcTimeout) of
@@ -236,13 +249,6 @@ with_os(Handlers) ->
         Handler   -> Handler()
     end.
 
-script_filename() ->
-    ScriptHome = getenv("RABBITMQ_SCRIPT_HOME"),
-    ScriptName = with_os(
-                   [{unix , fun () -> "rabbitmq-server" end},
-                    {win32, fun () -> "rabbitmq-server.bat" end}]),
-    ScriptHome ++ "/" ++ ScriptName ++ " -noinput".
-
 pids_file() -> getenv("RABBITMQ_PIDS_FILE").
 
 write_pids_file(Pids) ->
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index e9634c03c7..406977b42a 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 84be7918e9..cf04f05b7e 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -32,10 +32,12 @@
 -module(rabbit_networking).
 
 -export([boot/0, start/0, start_tcp_listener/2, start_ssl_listener/3,
-        stop_tcp_listener/2, on_node_down/1, active_listeners/0,
-        node_listeners/1, connections/0, connection_info/1,
-        connection_info/2, connection_info_all/0,
-        connection_info_all/1]).
+         stop_tcp_listener/2, on_node_down/1, active_listeners/0,
+         node_listeners/1, connections/0, connection_info_keys/0,
+         connection_info/1, connection_info/2,
+         connection_info_all/0, connection_info_all/1,
+         close_connection/2]).
+
 %%used by TCP-based transports, e.g. STOMP adapter
 -export([check_tcp_listener_address/3]).
 
@@ -70,10 +72,12 @@
 -spec(active_listeners/0 :: () -> [listener()]).
 -spec(node_listeners/1 :: (erlang_node()) -> [listener()]).
 -spec(connections/0 :: () -> [connection()]).
+-spec(connection_info_keys/0 :: () -> [info_key()]).
 -spec(connection_info/1 :: (connection()) -> [info()]).
 -spec(connection_info/2 :: (connection(), [info_key()]) -> [info()]).
 -spec(connection_info_all/0 :: () -> [[info()]]).
 -spec(connection_info_all/1 :: ([info_key()]) -> [[info()]]).
+-spec(close_connection/2 :: (pid(), string()) -> 'ok').
 -spec(on_node_down/1 :: (erlang_node()) -> 'ok').
 -spec(check_tcp_listener_address/3 :: (atom(), host(), ip_port()) ->
              {ip_address(), atom()}).
@@ -214,12 +218,21 @@ connections() ->
     [Pid || {_, Pid, _, _} <- supervisor:which_children(
                                 rabbit_tcp_client_sup)].
 
+connection_info_keys() -> rabbit_reader:info_keys().
+
 connection_info(Pid) -> rabbit_reader:info(Pid).
 connection_info(Pid, Items) -> rabbit_reader:info(Pid, Items).
 
 connection_info_all() -> cmap(fun (Q) -> connection_info(Q) end).
 connection_info_all(Items) -> cmap(fun (Q) -> connection_info(Q, Items) end).
 
+close_connection(Pid, Explanation) ->
+    case lists:any(fun ({_, ChildPid, _, _}) -> ChildPid =:= Pid end,
+                   supervisor:which_children(rabbit_tcp_client_sup)) of
+        true  -> rabbit_reader:shutdown(Pid, Explanation);
+        false -> throw({error, {not_a_connection_pid, Pid}})
+    end.
+
 %%--------------------------------------------------------------------
 
 tcp_host({0,0,0,0}) ->
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index 14a69a472e..f3013a16cf 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_persister.erl b/src/rabbit_persister.erl
index 687fc5b3bb..019d2a269d 100644
--- a/src/rabbit_persister.erl
+++ b/src/rabbit_persister.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl
index 4fcfab7895..274981efed 100644
--- a/src/rabbit_plugin_activator.erl
+++ b/src/rabbit_plugin_activator.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 503e2fb4ae..1a4830e11c 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -33,7 +33,7 @@
 -include("rabbit_framing.hrl").
 -include("rabbit.hrl").
 
--export([start_link/0, info/1, info/2]).
+-export([start_link/0, info_keys/0, info/1, info/2, shutdown/2]).
 
 -export([system_continue/3, system_terminate/4, system_code_change/4]).
 
@@ -129,8 +129,10 @@
 
 -ifdef(use_specs).
 
+-spec(info_keys/0 :: () -> [info_key()]).
 -spec(info/1 :: (pid()) -> [info()]).
 -spec(info/2 :: (pid(), [info_key()]) -> [info()]).
+-spec(shutdown/2 :: (pid(), string()) -> 'ok').
 
 -endif.
 
@@ -139,6 +141,9 @@
 start_link() ->
     {ok, proc_lib:spawn_link(?MODULE, init, [self()])}.
 
+shutdown(Pid, Explanation) ->
+    gen_server:call(Pid, {shutdown, Explanation}, infinity).
+
 init(Parent) ->
     Deb = sys:debug_options([]),
     receive
@@ -155,6 +160,8 @@ system_terminate(Reason, _Parent, _Deb, _State) ->
 system_code_change(Misc, _Module, _OldVsn, _Extra) ->
     {ok, Misc}.
 
+info_keys() -> ?INFO_KEYS.
+
 info(Pid) ->
     gen_server:call(Pid, info, infinity).
 
@@ -264,13 +271,8 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) ->
         {inet_async, Sock, Ref, {error, Reason}} ->
             throw({inet_error, Reason});
         {'EXIT', Parent, Reason} ->
-            if State#v1.connection_state =:= running ->
-                    send_exception(State, 0,
-                        rabbit_misc:amqp_error(connection_forced,
-                            "broker forced connection closure with reason '~w'",
-                            [Reason], none));
-               true -> ok
-            end,
+            terminate(io_lib:format("broker forced connection closure "
+                                    "with reason '~w'", [Reason]), State),
             %% this is what we are expected to do according to
             %% http://www.erlang.org/doc/man/sys.html
             %%
@@ -298,6 +300,13 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) ->
             end;
         timeout ->
             throw({timeout, State#v1.connection_state});
+        {'$gen_call', From, {shutdown, Explanation}} ->
+            {ForceTermination, NewState} = terminate(Explanation, State),
+            gen_server:reply(From, ok),
+            case ForceTermination of
+                force  -> ok;
+                normal -> mainloop(Parent, Deb, NewState)
+            end;
         {'$gen_call', From, info} ->
             gen_server:reply(From, infos(?INFO_KEYS, State)),
             mainloop(Parent, Deb, State);
@@ -320,6 +329,13 @@ switch_callback(OldState, NewCallback, Length) ->
     OldState#v1{callback = NewCallback,
                 recv_ref = Ref}.
 
+terminate(Explanation, State = #v1{connection_state = running}) ->
+    {normal, send_exception(State, 0,
+                            rabbit_misc:amqp_error(
+                              connection_forced, Explanation, [], none))};
+terminate(_Explanation, State) ->
+    {force, State}.
+
 close_connection(State = #v1{connection = #connection{
                                timeout_sec = TimeoutSec}}) ->
     %% We terminate the connection after the specified interval, but
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index afaf9d456d..884ea4ab5c 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_sasl_report_file_h.erl b/src/rabbit_sasl_report_file_h.erl
index 2a365ce10e..434cdae050 100644
--- a/src/rabbit_sasl_report_file_h.erl
+++ b/src/rabbit_sasl_report_file_h.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_sup.erl b/src/rabbit_sup.erl
index ef32544cc4..a1b8948155 100644
--- a/src/rabbit_sup.erl
+++ b/src/rabbit_sup.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 94c88673fb..82f2d19918 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -31,6 +31,8 @@
 
 -module(rabbit_tests).
 
+-compile([export_all]).
+
 -export([all_tests/0, test_parsing/0]).
 
 %% Exported so the hook mechanism can call back
@@ -49,6 +51,7 @@ test_content_prop_roundtrip(Datum, Binary) ->
 
 all_tests() ->
     passed = test_priority_queue(),
+    passed = test_pg_local(),
     passed = test_unfold(),
     passed = test_parsing(),
     passed = test_topic_matching(),
@@ -183,6 +186,31 @@ test_simple_n_element_queue(N) ->
     {true, false, N, ToListRes, Items} = test_priority_queue(Q),
     passed.
 
+test_pg_local() ->
+    [P, Q] = [spawn(fun () -> receive X -> X end end) || _ <- [x, x]],
+    check_pg_local(ok, [], []),
+    check_pg_local(pg_local:join(a, P), [P], []),
+    check_pg_local(pg_local:join(b, P), [P], [P]),
+    check_pg_local(pg_local:join(a, P), [P, P], [P]),
+    check_pg_local(pg_local:join(a, Q), [P, P, Q], [P]),
+    check_pg_local(pg_local:join(b, Q), [P, P, Q], [P, Q]),
+    check_pg_local(pg_local:join(b, Q), [P, P, Q], [P, Q, Q]),
+    check_pg_local(pg_local:leave(a, P), [P, Q], [P, Q, Q]),
+    check_pg_local(pg_local:leave(b, P), [P, Q], [Q, Q]),
+    check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
+    check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
+    [begin X ! done,
+           Ref = erlang:monitor(process, X),
+           receive {'DOWN', Ref, process, X, _Info} -> ok end
+     end  || X <- [P, Q]],
+    check_pg_local(ok, [], []),
+    passed.
+
+check_pg_local(ok, APids, BPids) ->
+    ok = pg_local:sync(),
+    [true, true] = [lists:sort(Pids) == lists:sort(pg_local:get_members(Key)) ||
+                       {Key, Pids} <- [{a, APids}, {b, BPids}]].
+
 test_unfold() ->
     {[], test} = rabbit_misc:unfold(fun (_V) -> false end, test),
     List = lists:seq(2,20,2),
@@ -690,45 +718,50 @@ test_user_management() ->
 
 test_server_status() ->
 
-    %% create a queue so we have something to list
-    Q = #amqqueue{} = rabbit_amqqueue:declare(
-                        rabbit_misc:r(<<"/">>, queue, <<"foo">>),
-                        false, false, []),
+    %% create a few things so there is some useful information to list
+    Writer = spawn(fun () -> receive shutdown -> ok end end),
+    Ch = rabbit_channel:start_link(1, self(), Writer, <<"user">>, <<"/">>),
+    [Q, Q2] = [#amqqueue{} = rabbit_amqqueue:declare(
+                               rabbit_misc:r(<<"/">>, queue, Name),
+                               false, false, []) ||
+                  Name <- [<<"foo">>, <<"bar">>]],
+
+    ok = rabbit_amqqueue:claim_queue(Q, self()),
+    ok = rabbit_amqqueue:basic_consume(Q, true, self(), Ch, undefined,
+                                       <<"ctag">>, true, undefined),
 
     %% list queues
-    ok = info_action(
-           list_queues,
-           [name, durable, auto_delete, arguments, pid,
-            messages_ready, messages_unacknowledged, messages_uncommitted,
-            messages, acks_uncommitted, consumers, transactions, memory],
-           true),
+    ok = info_action(list_queues, rabbit_amqqueue:info_keys(), true),
 
     %% list exchanges
-    ok = info_action(
-           list_exchanges,
-           [name, type, durable, auto_delete, arguments],
-           true),
+    ok = info_action(list_exchanges, rabbit_exchange:info_keys(), true),
 
     %% list bindings
     ok = control_action(list_bindings, []),
 
-    %% cleanup
-    {ok, _} = rabbit_amqqueue:delete(Q, false, false),
-
     %% list connections
     [#listener{host = H, port = P} | _] =
         [L || L = #listener{node = N} <- rabbit_networking:active_listeners(),
               N =:= node()],
 
-    {ok, C} = gen_tcp:connect(H, P, []),
+    {ok, _C} = gen_tcp:connect(H, P, []),
     timer:sleep(100),
-    ok = info_action(
-           list_connections,
-           [pid, address, port, peer_address, peer_port, state,
-            channels, user, vhost, timeout, frame_max,
-            recv_oct, recv_cnt, send_oct, send_cnt, send_pend],
-           false),
-    ok = gen_tcp:close(C),
+    ok = info_action(list_connections,
+                     rabbit_networking:connection_info_keys(), false),
+    %% close_connection
+    [ConnPid] = rabbit_networking:connections(),
+    ok = control_action(close_connection, [rabbit_misc:pid_to_string(ConnPid),
+                                           "go away"]),
+
+    %% list channels
+    ok = info_action(list_channels, rabbit_channel:info_keys(), false),
+
+    %% list consumers
+    ok = control_action(list_consumers, []),
+
+    %% cleanup
+    [{ok, _} = rabbit_amqqueue:delete(QR, false, false) || QR <- [Q, Q2]],
+    ok = rabbit_channel:shutdown(Ch),
 
     passed.
 
diff --git a/src/rabbit_tracer.erl b/src/rabbit_tracer.erl
index 0c023f2aab..484249b1df 100644
--- a/src/rabbit_tracer.erl
+++ b/src/rabbit_tracer.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 02b9968d67..54c60f5be0 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/tcp_acceptor.erl b/src/tcp_acceptor.erl
index 5364acf945..68efc27f97 100644
--- a/src/tcp_acceptor.erl
+++ b/src/tcp_acceptor.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/tcp_acceptor_sup.erl b/src/tcp_acceptor_sup.erl
index f2bad5bc2e..6e3bc4c966 100644
--- a/src/tcp_acceptor_sup.erl
+++ b/src/tcp_acceptor_sup.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/tcp_client_sup.erl b/src/tcp_client_sup.erl
index d92066a6c3..1b78584384 100644
--- a/src/tcp_client_sup.erl
+++ b/src/tcp_client_sup.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/tcp_listener.erl b/src/tcp_listener.erl
index fdb6ec8673..73ef9586bf 100644
--- a/src/tcp_listener.erl
+++ b/src/tcp_listener.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl
index d6bbac080f..0fe1542616 100644
--- a/src/tcp_listener_sup.erl
+++ b/src/tcp_listener_sup.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 02bd04991e..cd03fcc6e6 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -18,11 +18,11 @@
 %%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 %%   Technologies LLC, and Rabbit Technologies Ltd.
 %%
-%%   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 %%   Ltd. Portions created by Cohesive Financial Technologies LLC are
-%%   Copyright (C) 2007-2009 Cohesive Financial Technologies
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
 %%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%%   (C) 2007-2009 Rabbit Technologies Ltd.
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
 %%
 %%   All Rights Reserved.
 %%
@@ -261,14 +261,29 @@ get_total_memory({unix,freebsd}) ->
     PageCount * PageSize;
 
 get_total_memory({win32,_OSname}) ->
-    %% Due to the Erlang print format bug, on Windows boxes the memory size is
-    %% broken. For example Windows 7 64 bit with 4Gigs of RAM we get negative
-    %% memory size:
+    %% Due to the Erlang print format bug, on Windows boxes the memory
+    %% size is broken. For example Windows 7 64 bit with 4Gigs of RAM
+    %% we get negative memory size:
     %% > os_mon_sysinfo:get_mem_info().
     %% ["76 -1658880 1016913920 -1 -1021628416 2147352576 2134794240\n"]
-    %% Due to this bug, we don't actually know anything. Even if the number is
-    %% postive we can't be sure if it's correct.
-    unknown;
+    %% Due to this bug, we don't actually know anything. Even if the
+    %% number is postive we can't be sure if it's correct. This only
+    %% affects us on os_mon versions prior to 2.2.1.
+    case application:get_key(os_mon, vsn) of
+        undefined ->
+            unknown;
+        {ok, Version} ->
+            case rabbit_misc:version_compare(Version, "2.2.1", lt) of
+                true -> %% os_mon is < 2.2.1, so we know nothing
+                    unknown;
+                false ->
+                    [Result|_] = os_mon_sysinfo:get_mem_info(),
+                    {ok, [_MemLoad, TotPhys, _AvailPhys,
+                          _TotPage, _AvailPage, _TotV, _AvailV], _RestStr} =
+                        io_lib:fread("~d~d~d~d~d~d~d", Result),
+                    TotPhys
+            end
+    end;
 
 get_total_memory({unix, linux}) ->
     File = read_proc_file("/proc/meminfo"),