Skip to content

Commit b3e28d2

Browse files
committed
rabbit_log -> logger in CLI tests
1 parent 360ffe0 commit b3e28d2

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

deps/rabbitmq_cli/mix.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ defmodule RabbitMQCtl.MixfileBase do
3939
:rabbit_event,
4040
:rabbit_file,
4141
:rabbit_net,
42-
:rabbit_log,
4342
:rabbit_misc,
4443
:rabbit_mnesia,
4544
:rabbit_nodes_common,

deps/rabbitmq_cli/test/diagnostics/log_location_command_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ defmodule LogLocationCommandTest do
5656
test "run: prints default log location", context do
5757
{:ok, logfile} = @command.run([], context[:opts])
5858
log_message = "file location"
59-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist(log_message)])
59+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist(log_message)])
6060
wait_for_log_message(log_message, logfile)
6161
{:ok, log_file_data} = File.read(logfile)
6262
assert String.match?(log_file_data, Regex.compile!(log_message))
@@ -67,12 +67,12 @@ defmodule LogLocationCommandTest do
6767
[logfile | _] = @command.run([], Map.merge(context[:opts], %{all: true}))
6868

6969
log_message = "checking the default log file when checking all"
70-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist(log_message)])
70+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist(log_message)])
7171
wait_for_log_message(log_message, logfile)
7272

7373
log_message_upgrade = "checking the upgrade log file when checking all"
7474

75-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :log, [
75+
:rpc.call(get_rabbit_hostname(), :logger, :log, [
7676
:upgrade,
7777
:error,
7878
to_charlist(log_message_upgrade),

deps/rabbitmq_cli/test/diagnostics/log_tail_command_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ defmodule LogTailCommandTest do
6161
:lists.seq(1, 50),
6262
fn n ->
6363
message = "Getting log tail #{n}"
64-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist(message)])
64+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist(message)])
6565
message
6666
end
6767
)
@@ -84,7 +84,7 @@ defmodule LogTailCommandTest do
8484
:lists.seq(1, 50),
8585
fn n ->
8686
message = "More lines #{n}"
87-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist(message)])
87+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist(message)])
8888
message
8989
end
9090
)
@@ -102,7 +102,7 @@ defmodule LogTailCommandTest do
102102
:lists.seq(1, 100),
103103
fn n ->
104104
message = "More lines #{n}"
105-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist(message)])
105+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist(message)])
106106
message
107107
end
108108
)

deps/rabbitmq_cli/test/diagnostics/log_tail_stream_command_test.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ defmodule LogTailStreamCommandTest do
5858
time_before = System.system_time(:second)
5959

6060
stream = @command.run([], Map.merge(context[:opts], %{duration: 15}))
61-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist("Message")])
62-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist("Message1")])
63-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist("Message2")])
64-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist("Message3")])
61+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist("Message")])
62+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist("Message1")])
63+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist("Message2")])
64+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist("Message3")])
6565

6666
# This may take a long time and fail with an ExUnit timeout
6767
data = Enum.join(stream)
@@ -99,7 +99,7 @@ defmodule LogTailStreamCommandTest do
9999
:ok
100100

101101
false ->
102-
:rpc.call(get_rabbit_hostname(), :rabbit_log, :error, [to_charlist("Ping")])
102+
:rpc.call(get_rabbit_hostname(), :logger, :error, [to_charlist("Ping")])
103103
:timer.sleep(100)
104104
ensure_file(log, attempts - 1)
105105
end

0 commit comments

Comments
 (0)