summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorLuke Bakken <lbakken@pivotal.io>2019-08-06 08:29:23 -0700
committerLuke Bakken <lbakken@pivotal.io>2019-08-13 14:35:55 -0700
commit9fd5d5661245c22c098ca4961e6066c8d9ef8cec (patch)
tree7b28dbdbe3af5faaaacddcc34cd248cd778b6925 /src/rabbit.erl
parent2845f4eeedbbf17394e29e9eef9f6b52481cf79a (diff)
downloadrabbitmq-server-git-9fd5d5661245c22c098ca4961e6066c8d9ef8cec.tar.gz
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
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl8
1 files changed, 4 insertions, 4 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