Merge no-pluggable-exchange branch into v1.7-series branch.

Author: Michael Bridgen

Makefile

@@ -15,7 +15,20 @@ TARGETS=$(EBIN_DIR)/rabbit.app $(BEAM_TARGETS)
 WEB_URL=http://stage.rabbitmq.com/
 MANPAGES=$(patsubst %.pod, %.gz, $(wildcard docs/*.[0-9].pod))
 
+ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
 PYTHON=python
+else
+ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes)
+PYTHON=python2.6
+else
+ifeq ($(shell python2.5 -c 'import simplejson' 2>/dev/null && echo yes),yes)
+PYTHON=python2.5
+else
+# Hmm. Missing simplejson?
+PYTHON=python
+endif
+endif
+endif
 
 BASIC_PLT=basic.plt
 RABBIT_PLT=rabbit.plt
@@ -46,7 +59,7 @@ ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
 all: $(TARGETS)
 
 $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
-	escript generate_app $(EBIN_DIR) < $< > $@
+	escript generate_app $(EBIN_DIR) $@ < $<
 
 $(EBIN_DIR)/gen_server2.beam: $(SOURCE_DIR)/gen_server2.erl
 	erlc $(ERLC_OPTS) $<

codegen.py

@@ -228,12 +228,12 @@ def genEncodeProperties(c):
         print "  rabbit_binary_generator:encode_properties(%s, %s);" % \
               (fieldTypeList(c.fields), fieldTempList(c.fields))
 
-    def massageConstantClass(cls):
+    def messageConstantClass(cls):
         # We do this because 0.8 uses "soft error" and 8.1 uses "soft-error".
         return erlangConstantName(cls)
 
     def genLookupException(c,v,cls):
-        mCls = massageConstantClass(cls)
+        mCls = messageConstantClass(cls)
         if mCls == 'SOFT_ERROR': genLookupException1(c,'false')
         elif mCls == 'HARD_ERROR': genLookupException1(c, 'true')
         elif mCls == '': pass
@@ -244,6 +244,11 @@ def genLookupException1(c,hardErrorBoolStr):
         print 'lookup_amqp_exception(%s) -> {%s, ?%s, <<"%s">>};' % \
               (n.lower(), hardErrorBoolStr, n, n)
 
+    def genAmqpException(c,v,cls):
+        n = erlangConstantName(c)
+        print 'amqp_exception(?%s) -> %s;' % \
+            (n, n.lower())
+
     methods = spec.allMethods()
 
     print """-module(rabbit_framing).
@@ -260,6 +265,7 @@ def genLookupException1(c,hardErrorBoolStr):
 -export([encode_method_fields/1]).
 -export([encode_properties/1]).
 -export([lookup_amqp_exception/1]).
+-export([amqp_exception/1]).
 
 bitvalue(true) -> 1;
 bitvalue(false) -> 0;
@@ -296,8 +302,10 @@ def genLookupException1(c,hardErrorBoolStr):
     for (c,v,cls) in spec.constants: genLookupException(c,v,cls)
     print "lookup_amqp_exception(Code) ->"
     print "  rabbit_log:warning(\"Unknown AMQP error code '~p'~n\", [Code]),"
-    print "  {true, ?INTERNAL_ERROR, <<\"INTERNAL_ERROR\">>}."    
+    print "  {true, ?INTERNAL_ERROR, <<\"INTERNAL_ERROR\">>}."
 
+    for(c,v,cls) in spec.constants: genAmqpException(c,v,cls)
+    print "amqp_exception(_Code) -> undefined."
 
 def genHrl(spec):
     def erlType(domain):

docs/rabbitmqctl.1.pod

@@ -198,9 +198,9 @@ whether the queue will be deleted when no longer used
 
 queue arguments
 
-=item node
+=item pid
 
-node on which the process associated with the queue resides
+id of the Erlang process associated with the queue
 
 =item messages_ready
 
@@ -279,7 +279,7 @@ exchange arguments
 =item list_bindings [-p I<vhostpath>]
 
 List bindings by virtual host. Each line printed describes a binding,
-with the exchange name, routing key, queue name and arguments,
+with the exchange name, queue name, routing key and arguments,
 separated by tab characters.
 
 =item list_connections [I<connectioninfoitem> ...]
@@ -297,7 +297,7 @@ I<user>, I<peer_address>, I<peer_port> and I<state> are assumed.
 
 =item node
 
-node on which the process associated with the connection resides
+id of the Erlang process associated with the connection
 
 =item address
 
@@ -340,6 +340,11 @@ connection timeout
 
 maximum frame size (bytes)
 
+=item client_properties
+
+informational properties transmitted by the client during connection
+establishment
+
 =item recv_oct
 
 octets received

ebin/rabbit_app.in

@@ -17,8 +17,8 @@
   {env, [{tcp_listeners, [{"0.0.0.0", 5672}]},
          {ssl_listeners, []},
          {ssl_options, []},
+         {vm_memory_high_watermark, 0.4},
          {default_user, <<"guest">>},
          {default_pass, <<"guest">>},
          {default_vhost, <<"/">>},
-         {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
-         {memory_alarms, auto}]}]}.
+         {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}]}]}.

generate_app

@@ -1,10 +1,12 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
 
-main([BeamDir]) ->
+main([BeamDir, TargetFile]) ->
     Modules = [list_to_atom(filename:basename(F, ".beam")) ||
                   F <- filelib:wildcard("*.beam", BeamDir)],
     {ok, {application, Application, Properties}} = io:read(''),
     NewProperties = lists:keyreplace(modules, 1, Properties,
                                      {modules, Modules}),
-    io:format("~p.", [{application, Application, NewProperties}]).
+    file:write_file(
+      TargetFile,
+      io_lib:format("~p.~n", [{application, Application, NewProperties}])).

include/rabbit.hrl

@@ -36,7 +36,7 @@
 
 -record(vhost, {virtual_host, dummy}).
 
--record(connection, {user, timeout_sec, frame_max, vhost}).
+-record(connection, {user, timeout_sec, frame_max, vhost, client_properties}).
 
 -record(content,
         {class_id,

packaging/RPMS/Fedora/rabbitmq-server.spec

@@ -75,9 +75,8 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
 %pre
 
 if [ $1 -gt 1 ]; then
-  #Upgrade - stop and remove previous instance of rabbitmq-server init.d script
+  # Upgrade - stop previous instance of rabbitmq-server init.d script
   /sbin/service rabbitmq-server stop
-  /sbin/chkconfig --del rabbitmq-server
 fi
 
 # create rabbitmq group

packaging/common/rabbitmq-asroot-script-wrapper

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ##   The contents of this file are subject to the Mozilla Public License
 ##   Version 1.1 (the "License"); you may not use this file except in
 ##   compliance with the License. You may obtain a copy of the License at
@@ -30,24 +30,16 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-# Escape spaces and quotes, because shell is revolting.
-for arg in "$@" ; do
-	# Escape quotes in parameters, so that they're passed through cleanly.
-	arg=$(sed -e 's/"/\\"/g' <<-END
-		$arg
-		END
-	)
-	CMDLINE="${CMDLINE} \"${arg}\""
-done
-
 cd /var/lib/rabbitmq
 
 SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
-    /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
+    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
-    echo -e "\nOnly root should run ${SCRIPT}\n"
+    echo
+    echo "Only root should run ${SCRIPT}"
+    echo
     exit 1
 fi
 

packaging/common/rabbitmq-script-wrapper

@@ -46,9 +46,13 @@ SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
     su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+elif [ `id -u` = `id -u rabbitmq` ] ; then
+    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
-    echo -e "\nOnly root should run ${SCRIPT}\n"
+    echo
+    echo "Only root or rabbitmq should run ${SCRIPT}"
+    echo
     exit 1
 fi
 

packaging/common/rabbitmq-server.init

@@ -66,8 +66,6 @@ stop_rabbitmq () {
         $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
         RETVAL=$?
         if [ $RETVAL = 0 ] ; then
-            # Try to stop epmd if run by the rabbitmq user
-            pkill -u rabbitmq epmd || :
             [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
         else
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err