Remove short name formatting

fix missing quote in mkdir argument to handle directories with spaces properly on Windows

Ensure paths are double-quoted when necessary

Ensure all win32 paths have forward slashes. Use more typical escaping of double quotes

Do not convert to a binary as that has bad effects when the msg store dir base has extended ASCII characters, as when setting RABBITMQ_BASE to C:/ProgramData/Tést Directory (frazzle)/RabbitMQ

Add "t" modifier to format strings for values that may be unicode

Remove use of unquote as it only works when the second arg is not double-quoted when called, but that version fails on paths with spaces.

De-quote ALL THE THINGS

Update rabbitmq-components.mk

(cherry picked from commit a515903662566e0fc158918bc1c42fc1a0a8384a)

Log file management suite: adapt to Lager 3.8

I observed no functional changes around log rotation.
These assertions depend on internal file management
aspects of Lager, so let's update them and see.

References #2068, #2059.

(cherry picked from commit d6e7c3841c5f01933e9182da1701bd2ac74eb1ff)
(cherry picked from commit 6a9eb18ca1f1f3d5166e923f54f4ed349a1b95a2)

Replace dequote function with replace syntax, which works with unicode characters

4 files changed, 8 insertions, 8 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 3dd963b813..224b9e4908 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -1175,7 +1175,7 @@ print_banner() ->
     {ok, Version} = application:get_key(vsn),
     {LogFmt, LogLocations} = case log_locations() of
         [_ | Tail] = LL ->
-            LF = lists:flatten(["~n                    ~s"
+            LF = lists:flatten(["~n                    ~ts"
                                 || _ <- lists:seq(1, length(Tail))]),
             {LF, LL};
         [] ->
@@ -1185,7 +1185,7 @@ print_banner() ->
               "~n  ##  ##      ~s ~s. ~s"
               "~n  ##########  ~s"
               "~n  ######  ##"
-              "~n  ##########  Logs: ~s" ++
+              "~n  ##########  Logs: ~ts" ++
               LogFmt ++
               "~n~n              Starting broker..."
               "~n",
@@ -1209,7 +1209,7 @@ log_banner() ->
     DescrLen = 1 + lists:max([length(K) || {K, _V} <- Settings]),
     Format = fun (K, V) ->
                      rabbit_misc:format(
-                       " ~-" ++ integer_to_list(DescrLen) ++ "s: ~s~n", [K, V])
+                       " ~-" ++ integer_to_list(DescrLen) ++ "s: ~ts~n", [K, V])
              end,
     Banner = string:strip(lists:flatten(
                [case S of
@@ -1220,7 +1220,7 @@ log_banner() ->
                     {K, V} ->
                         Format(K, V)
                 end || S <- Settings]), right, $\n),
-    rabbit_log:info("~n~s", [Banner]).
+    rabbit_log:info("~n~ts", [Banner]).
 
 warn_if_kernel_config_dubious() ->
     case os:type() of
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl
index b0066183ee..a3b7ad5657 100644
--- a/src/rabbit_config.erl
+++ b/src/rabbit_config.erl
@@ -143,7 +143,7 @@ generate_config_file(ConfFiles, ConfDir, ScriptDir, SchemaDir, Advanced) ->
     Command = lists:concat(["escript ", "\"", Cuttlefish, "\"",
                             "  -f rabbitmq -s ", "\"", SchemaDir, "\"",
                             " -e ", "\"",  ConfDir, "\"",
-                            [[" -c ", ConfFile] || ConfFile <- ConfFiles],
+                            [[" -c \"", ConfFile, "\""] || ConfFile <- ConfFiles],
                             AdvancedConfigArg]),
     rabbit_log:debug("Generating config file using '~s'", [Command]),
     Result = rabbit_misc:os_cmd(Command),
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index bd1c26f20f..8c27d14bc9 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -79,7 +79,7 @@ init() ->
     ensure_mnesia_dir(),
     case is_virgin_node() of
         true  ->
-            rabbit_log:info("Node database directory at ~s is empty. "
+            rabbit_log:info("Node database directory at ~ts is empty. "
                             "Assuming we need to join an existing cluster or initialise from scratch...~n",
                             [dir()]),
             rabbit_peer_discovery:log_configured_backend(),
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl
index 8ab5a09725..ebf0c442a9 100644
--- a/src/rabbit_vhost.erl
+++ b/src/rabbit_vhost.erl
@@ -47,7 +47,7 @@ recover() ->
 
 recover(VHost) ->
     VHostDir = rabbit_vhost:msg_store_dir_path(VHost),
-    rabbit_log:info("Making sure data directory '~s' for vhost '~s' exists~n",
+    rabbit_log:info("Making sure data directory '~ts' for vhost '~s' exists~n",
                     [VHostDir, VHost]),
     VHostStubFile = filename:join(VHostDir, ".vhost"),
     ok = rabbit_file:ensure_dir(VHostStubFile),
@@ -306,7 +306,7 @@ dir(Vhost) ->
     rabbit_misc:format("~.36B", [Num]).
 
 msg_store_dir_path(VHost) ->
-    EncodedName = list_to_binary(dir(VHost)),
+    EncodedName = dir(VHost),
     rabbit_data_coercion:to_list(filename:join([msg_store_dir_base(),
                                                 EncodedName])).