summaryrefslogtreecommitdiff
path: root/deps/rabbit_common/src
diff options
context:
space:
mode:
Diffstat (limited to 'deps/rabbit_common/src')
-rw-r--r--deps/rabbit_common/src/file_handle_cache.erl4
-rw-r--r--deps/rabbit_common/src/rabbit_amqp_connection.erl4
-rw-r--r--deps/rabbit_common/src/rabbit_binary_generator.erl2
-rw-r--r--deps/rabbit_common/src/rabbit_ssl_options.erl4
-rw-r--r--deps/rabbit_common/src/vm_memory_monitor.erl18
5 files changed, 16 insertions, 16 deletions
diff --git a/deps/rabbit_common/src/file_handle_cache.erl b/deps/rabbit_common/src/file_handle_cache.erl
index 80d6c32de3..50ea181d14 100644
--- a/deps/rabbit_common/src/file_handle_cache.erl
+++ b/deps/rabbit_common/src/file_handle_cache.erl
@@ -1083,8 +1083,8 @@ init([AlarmSet, AlarmClear]) ->
end
end,
ObtainLimit = obtain_limit(Limit),
- error_logger:info_msg("Limiting to approx ~p file handles (~p sockets)~n",
- [Limit, ObtainLimit]),
+ logger:info("Limiting to approx ~p file handles (~p sockets)",
+ [Limit, ObtainLimit]),
Clients = ets:new(?CLIENT_ETS_TABLE, [set, private, {keypos, #cstate.pid}]),
Elders = ets:new(?ELDERS_ETS_TABLE, [set, private]),
{ok, #fhc_state { elders = Elders,
diff --git a/deps/rabbit_common/src/rabbit_amqp_connection.erl b/deps/rabbit_common/src/rabbit_amqp_connection.erl
index 72784644a7..058fa7d590 100644
--- a/deps/rabbit_common/src/rabbit_amqp_connection.erl
+++ b/deps/rabbit_common/src/rabbit_amqp_connection.erl
@@ -14,11 +14,11 @@ amqp_params(ConnPid, Timeout) ->
P = try
gen_server:call(ConnPid, {info, [amqp_params]}, Timeout)
catch exit:{noproc, Error} ->
- rabbit_log:debug("file ~p, line ~p - connection process ~p not alive: ~p~n",
+ rabbit_log:debug("file ~p, line ~p - connection process ~p not alive: ~p",
[?FILE, ?LINE, ConnPid, Error]),
[];
_:Error ->
- rabbit_log:debug("file ~p, line ~p - failed to get amqp_params from connection process ~p: ~p~n",
+ rabbit_log:debug("file ~p, line ~p - failed to get amqp_params from connection process ~p: ~p",
[?FILE, ?LINE, ConnPid, Error]),
[]
end,
diff --git a/deps/rabbit_common/src/rabbit_binary_generator.erl b/deps/rabbit_common/src/rabbit_binary_generator.erl
index 300f6b6c80..1df98e50c4 100644
--- a/deps/rabbit_common/src/rabbit_binary_generator.erl
+++ b/deps/rabbit_common/src/rabbit_binary_generator.erl
@@ -223,7 +223,7 @@ lookup_amqp_exception(#amqp_error{name = Name,
ExplBin = amqp_exception_explanation(Text, Expl),
{ShouldClose, Code, ExplBin, Method};
lookup_amqp_exception(Other, Protocol) ->
- rabbit_log:warning("Non-AMQP exit reason '~p'~n", [Other]),
+ rabbit_log:warning("Non-AMQP exit reason '~p'", [Other]),
{ShouldClose, Code, Text} = Protocol:lookup_amqp_exception(internal_error),
{ShouldClose, Code, Text, none}.
diff --git a/deps/rabbit_common/src/rabbit_ssl_options.erl b/deps/rabbit_common/src/rabbit_ssl_options.erl
index 738780ebb2..e5302d4420 100644
--- a/deps/rabbit_common/src/rabbit_ssl_options.erl
+++ b/deps/rabbit_common/src/rabbit_ssl_options.erl
@@ -43,7 +43,7 @@ make_verify_fun(Module, Function, InitialUserState) ->
Module:module_info()
catch
_:Exception ->
- rabbit_log:error("SSL verify_fun: module ~s missing: ~p~n",
+ rabbit_log:error("TLS verify_fun: module ~s missing: ~p",
[Module, Exception]),
throw({error, {invalid_verify_fun, missing_module}})
end,
@@ -66,7 +66,7 @@ make_verify_fun(Module, Function, InitialUserState) ->
Module:Function(Args)
end;
_ ->
- rabbit_log:error("SSL verify_fun: no ~s:~s/3 exported~n",
+ rabbit_log:error("TLS verify_fun: no ~s:~s/3 exported",
[Module, Function]),
throw({error, {invalid_verify_fun, function_not_exported}})
end.
diff --git a/deps/rabbit_common/src/vm_memory_monitor.erl b/deps/rabbit_common/src/vm_memory_monitor.erl
index 22a1070377..6cd3034888 100644
--- a/deps/rabbit_common/src/vm_memory_monitor.erl
+++ b/deps/rabbit_common/src/vm_memory_monitor.erl
@@ -88,7 +88,7 @@ get_total_memory() ->
{error, parse_error} ->
rabbit_log:warning(
"The override value for the total memmory available is "
- "not a valid value: ~p, getting total from the system.~n",
+ "not a valid value: ~p, getting total from the system.",
[Value]),
get_total_memory_from_os()
end;
@@ -249,7 +249,7 @@ get_cached_process_memory_and_limit() ->
try
gen_server:call(?MODULE, get_cached_process_memory_and_limit, infinity)
catch exit:{noproc, Error} ->
- rabbit_log:warning("Memory monitor process not yet started: ~p~n", [Error]),
+ rabbit_log:warning("Memory monitor process not yet started: ~p", [Error]),
ProcessMemory = get_process_memory_uncached(),
{ProcessMemory, infinity}
end.
@@ -304,7 +304,7 @@ get_total_memory_from_os() ->
get_total_memory(os:type())
catch _:Error:Stacktrace ->
rabbit_log:warning(
- "Failed to get total system memory: ~n~p~n~p~n",
+ "Failed to get total system memory: ~n~p~n~p",
[Error, Stacktrace]),
unknown
end.
@@ -327,7 +327,7 @@ set_mem_limits(State, MemLimit) ->
memory_limit = undefined } ->
rabbit_log:warning(
"Unknown total memory size for your OS ~p. "
- "Assuming memory size is ~p MiB (~p bytes).~n",
+ "Assuming memory size is ~p MiB (~p bytes).",
[os:type(),
trunc(?MEMORY_SIZE_FOR_UNKNOWN_OS/?ONE_MiB),
?MEMORY_SIZE_FOR_UNKNOWN_OS]);
@@ -344,7 +344,7 @@ set_mem_limits(State, MemLimit) ->
"Only ~p MiB (~p bytes) of ~p MiB (~p bytes) memory usable due to "
"limited address space.~n"
"Crashes due to memory exhaustion are possible - see~n"
- "https://www.rabbitmq.com/memory.html#address-space~n",
+ "https://www.rabbitmq.com/memory.html#address-space",
[trunc(Limit/?ONE_MiB), Limit, trunc(TotalMemory/?ONE_MiB),
TotalMemory]),
Limit;
@@ -354,7 +354,7 @@ set_mem_limits(State, MemLimit) ->
MemLim = interpret_limit(parse_mem_limit(MemLimit), UsableMemory),
rabbit_log:info(
"Memory high watermark set to ~p MiB (~p bytes)"
- " of ~p MiB (~p bytes) total~n",
+ " of ~p MiB (~p bytes) total",
[trunc(MemLim/?ONE_MiB), MemLim,
trunc(TotalMemory/?ONE_MiB), TotalMemory]
),
@@ -380,13 +380,13 @@ parse_mem_limit(MemLimit) when is_float(MemLimit), MemLimit =< ?MAX_VM_MEMORY_HI
MemLimit;
parse_mem_limit(MemLimit) when is_float(MemLimit), MemLimit > ?MAX_VM_MEMORY_HIGH_WATERMARK ->
rabbit_log:warning(
- "Memory high watermark of ~p is above the allowed maximum, falling back to ~p~n",
+ "Memory high watermark of ~p is above the allowed maximum, falling back to ~p",
[MemLimit, ?MAX_VM_MEMORY_HIGH_WATERMARK]
),
?MAX_VM_MEMORY_HIGH_WATERMARK;
parse_mem_limit(MemLimit) ->
rabbit_log:warning(
- "Memory high watermark of ~p is invalid, defaulting to ~p~n",
+ "Memory high watermark of ~p is invalid, defaulting to ~p",
[MemLimit, ?DEFAULT_VM_MEMORY_HIGH_WATERMARK]
),
?DEFAULT_VM_MEMORY_HIGH_WATERMARK.
@@ -408,7 +408,7 @@ internal_update(State0 = #state{memory_limit = MemLimit,
emit_update_info(AlarmState, MemUsed, MemLimit) ->
rabbit_log:info(
- "vm_memory_high_watermark ~p. Memory used:~p allowed:~p~n",
+ "vm_memory_high_watermark ~p. Memory used:~p allowed:~p",
[AlarmState, MemUsed, MemLimit]).
%% According to https://msdn.microsoft.com/en-us/library/aa366778(VS.85).aspx
View Lorry Controller Status