merge default into bug24308

3 files changed, 17 insertions, 16 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 11cc7215..1831f876 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -65,8 +65,14 @@ fi
 RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
 
-mkdir -p $(dirname ${RABBITMQ_PID_FILE})
-echo $$ > ${RABBITMQ_PID_FILE}
+case "$(uname -s)" in
+  CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
+           # will not be able to make sense of it anyway
+           ;;
+  *)       mkdir -p $(dirname ${RABBITMQ_PID_FILE});
+           echo $$ > ${RABBITMQ_PID_FILE}
+           ;;
+esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
 if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index f3056cd4..1a26a200 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1178,6 +1178,14 @@ safe_ets_update_counter(Tab, Key, UpdateOp, SuccessFun, FailThunk) ->
     catch error:badarg -> FailThunk()
     end.
 
+update_msg_cache(CacheEts, MsgId, Msg) ->
+    case ets:insert_new(CacheEts, {MsgId, Msg, 1}) of
+        true  -> ok;
+        false -> safe_ets_update_counter(
+                   CacheEts, MsgId, {3, +1}, fun (_) -> ok end,
+                   fun () -> update_msg_cache(CacheEts, MsgId, Msg) end)
+    end.
+
 adjust_valid_total_size(File, Delta, State = #msstate {
                                        sum_valid_data   = SumValid,
                                        file_summary_ets = FileSummaryEts }) ->
@@ -1368,19 +1376,6 @@ list_sorted_file_names(Dir, Ext) ->
                filelib:wildcard("*" ++ Ext, Dir)).
 
 %%----------------------------------------------------------------------------
-%% message cache helper functions
-%%----------------------------------------------------------------------------
-
-update_msg_cache(CacheEts, MsgId, Msg) ->
-    case ets:insert_new(CacheEts, {MsgId, Msg, 1}) of
-        true  -> true = undefined =/= Msg, %% ASSERTION
-                 ok;
-        false -> safe_ets_update_counter(
-                   CacheEts, MsgId, {3, +1}, fun (_) -> ok end,
-                   fun () -> update_msg_cache(CacheEts, MsgId, Msg) end)
-    end.
-
-%%----------------------------------------------------------------------------
 %% index
 %%----------------------------------------------------------------------------
 
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl
index 27dadfc5..b06bcd83 100644
--- a/src/rabbit_plugins.erl
+++ b/src/rabbit_plugins.erl
@@ -67,7 +67,7 @@ start() ->
             print_error("~p", [Reason]),
             rabbit_misc:quit(2);
         Other ->
-            print_error("~s", [Other]),
+            print_error("~p", [Other]),
             rabbit_misc:quit(2)
     end.