diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_config.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_vhost.erl | 4 |
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])). |