Merged bug23052 into default

5 files changed, 22 insertions, 19 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index fb27e9bd..96d3974f 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -121,6 +121,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Tue Nov 8 2011 steve@rabbitmq.com 2.7.0-1
+- New Upstream Release
+
 * Fri Sep 9 2011 tim@rabbitmq.com 2.6.1-1
 - New Upstream Release
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 8f526544..ceb08ed0 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (2.7.0-1) natty; urgency=low
+
+  * New Upstream Release
+
+ -- Steve Powell <steve@rabbitmq.com>  Tue, 08 Nov 2011 16:47:50 +0000
+
 rabbitmq-server (2.6.1-1) natty; urgency=low
 
   * New Upstream Release
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 03f087d9..b6dad357 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -92,21 +92,15 @@ post-destroot {
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
                 ${wrappersbin}/rabbitmq-server
-
-    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \
-                ${filespath}/rabbitmq-script-wrapper
-    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
-                ${filespath}/rabbitmq-script-wrapper
-    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
-                ${filespath}/rabbitmq-script-wrapper
-
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
+    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:g" \
+                ${wrappersbin}/rabbitmq-server
+    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \
+                ${wrappersbin}/rabbitmq-server
+    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:g" \
                 ${wrappersbin}/rabbitmq-server
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmqctl
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmq-plugins
 
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
+    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
 
     xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz rabbitmq-plugins.1.gz \
         ${mandest}/man1/
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl
index cf3fea1a..523af749 100644
--- a/src/rabbit_guid.erl
+++ b/src/rabbit_guid.erl
@@ -76,14 +76,14 @@ guid() ->
     %% now() to move ahead of the system time), and b) it is really
     %% slow since it takes a global lock and makes a system call.
     %%
-    %% A persisted serial number, in combination with self/0 (which
-    %% includes the node name) uniquely identifies a process in space
+    %% A persisted serial number, the node, and a unique reference
+    %% (per node incarnation) uniquely identifies a process in space
     %% and time. We combine that with a process-local counter to give
     %% us a GUID.
     G = case get(guid) of
-            undefined -> {{gen_server:call(?SERVER, serial, infinity), self()},
-                          0};
-            {S, I}   -> {S, I+1}
+            undefined -> Serial = gen_server:call(?SERVER, serial, infinity),
+                         {{Serial, node(), make_ref()}, 0};
+            {S, I}    -> {S, I+1}
         end,
     put(guid, G),
     erlang:md5(term_to_binary(G)).
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index b359f7d4..694abd9e 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -281,7 +281,7 @@ handle_other({conserve_memory, Conserve}, Deb, State) ->
 handle_other({channel_closing, ChPid}, Deb, State) ->
     ok = rabbit_channel:ready_for_close(ChPid),
     channel_cleanup(ChPid),
-    mainloop(Deb, State);
+    mainloop(Deb, maybe_close(State));
 handle_other({'EXIT', Parent, Reason}, _Deb, State = #v1{parent = Parent}) ->
     terminate(io_lib:format("broker forced connection closure "
                             "with reason '~w'", [Reason]), State),