root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup compiler warnings

This commit is contained in:
Daniil Fedotov 2017-01-24 09:59:00 +00:00
parent 2174446ff9
commit 6288d75472
57 changed files with 54 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_cli/lib/rabbitmq/cli/core/command_modules.ex vendored
View File

@ -25,7 +25,7 @@ defmodule RabbitMQ.CLI.Core.CommandModules do
end
def is_command?([head | _]), do: is_command?(head)
def is_command?(str), do: module_map[str] != nil
def is_command?(str), do: module_map()[str] != nil
def load(opts) do
scope = script_scope(opts)

22
deps/rabbitmq_cli/lib/rabbitmq/cli/core/exit_codes.ex vendored
View File

@ -32,16 +32,16 @@ defmodule RabbitMQ.CLI.Core.ExitCodes do
def exit_tempfail, do: @exit_tempfail
def exit_config, do: @exit_config
def exit_code_for({:validation_failure, :not_enough_args}), do: exit_usage
def exit_code_for({:validation_failure, :too_many_args}), do: exit_usage
def exit_code_for({:validation_failure, {:not_enough_args, _}}), do: exit_usage
def exit_code_for({:validation_failure, {:too_many_args, _}}), do: exit_usage
def exit_code_for({:validation_failure, {:bad_argument, _}}), do: exit_dataerr
def exit_code_for({:validation_failure, :bad_argument}), do: exit_dataerr
def exit_code_for({:validation_failure, {:bad_option, _}}), do: exit_usage
def exit_code_for({:validation_failure, _}), do: exit_usage
def exit_code_for({:badrpc, :timeout}), do: exit_tempfail
def exit_code_for({:badrpc, :nodedown}), do: exit_unavailable
def exit_code_for({:error, _}), do: exit_software
def exit_code_for({:validation_failure, :not_enough_args}), do: exit_usage()
def exit_code_for({:validation_failure, :too_many_args}), do: exit_usage()
def exit_code_for({:validation_failure, {:not_enough_args, _}}), do: exit_usage()
def exit_code_for({:validation_failure, {:too_many_args, _}}), do: exit_usage()
def exit_code_for({:validation_failure, {:bad_argument, _}}), do: exit_dataerr()
def exit_code_for({:validation_failure, :bad_argument}), do: exit_dataerr()
def exit_code_for({:validation_failure, {:bad_option, _}}), do: exit_usage()
def exit_code_for({:validation_failure, _}), do: exit_usage()
def exit_code_for({:badrpc, :timeout}), do: exit_tempfail()
def exit_code_for({:badrpc, :nodedown}), do: exit_unavailable()
def exit_code_for({:error, _}), do: exit_software()
end

8
deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex vendored
View File

@ -25,19 +25,19 @@ defmodule RabbitMQ.CLI.Core.Helpers do
parse_node(RabbitMQ.CLI.Core.Config.get_option(:node))
end
def parse_node(nil), do: get_rabbit_hostname
def parse_node(nil), do: get_rabbit_hostname()
def parse_node(name) when is_atom(name) do
parse_node(to_string(name))
end
def parse_node(name) do
case String.split(name, "@", parts: 2) do
[_,""] -> name <> "#{hostname}" |> String.to_atom
[_,""] -> name <> "#{hostname()}" |> String.to_atom
[_,_] -> name |> String.to_atom
[_] -> name <> "@#{hostname}" |> String.to_atom
[_] -> name <> "@#{hostname()}" |> String.to_atom
end
end
def connect_to_rabbitmq, do: :net_kernel.connect_node(get_rabbit_hostname)
def connect_to_rabbitmq, do: :net_kernel.connect_node(get_rabbit_hostname())
def connect_to_rabbitmq(input) when is_atom(input), do: :net_kernel.connect_node(input)
def connect_to_rabbitmq(input) when is_binary(input) do
input

3
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_user_command.ex vendored
View File

@ -21,9 +21,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.AddUserCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate(args, _) when length(args) < 2 do

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.AddVhostCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/authenticate_user_command.ex vendored
View File

@ -16,8 +16,6 @@
defmodule RabbitMQ.CLI.Ctl.Commands.AuthenticateUserCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags []
def validate(args, _) when length(args) < 2, do: {:validation_failure, :not_enough_args}
def validate(args, _) when length(args) > 2, do: {:validation_failure, :too_many_args}
def validate([_,_], _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/cancel_sync_queue_command.ex vendored
View File

@ -18,7 +18,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.CancelSyncQueueCommand do
use RabbitMQ.CLI.DefaultOutput
def merge_defaults([_|_] = args, opts) do
{args, Map.merge(default_opts, opts)}
{args, Map.merge(default_opts(), opts)}
end
def usage, do: "cancel_sync_queue [-p <vhost>] queue"

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/change_password_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ChangePasswordCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate(args, _) when length(args) < 2, do: {:validation_failure, :not_enough_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_global_parameter_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearGlobalParameterCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts) do
{args, opts}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_operator_policy_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearOperatorPolicyCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_parameter_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearParameterCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_password_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPasswordCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_permissions_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPermissionsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_policy_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearPolicyCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/clear_topic_permissions_command.ex vendored
View File

@ -20,8 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ClearTopicPermissionsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}
end

6
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/close_all_connections_command.ex vendored
View File

@ -16,12 +16,10 @@
defmodule RabbitMQ.CLI.Ctl.Commands.CloseAllConnectionsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags []
def merge_defaults(args, opts) do
{args, Map.merge(%{global: false, vhost: "/", per_connection_delay: 0, limit: 0}, opts)}
end
def validate(args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate(args, _) when length(args) < 1, do: {:validation_failure, :not_enough_args}
def validate([_], _), do: :ok
@ -59,7 +57,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.CloseAllConnectionsCommand do
use RabbitMQ.CLI.DefaultOutput
def switches(), do: [global: :boolean, per_connection_delay: :integer, limit: :integer]
def usage, do: "close_all_connections [-p <vhost> --limit <limit>] [-n <node> --global] [--per-connection-delay <delay>] <explanation>"
def banner([explanation], %{node: node_name, global: true}) do

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/close_connection_command.ex vendored
View File

@ -17,8 +17,6 @@
defmodule RabbitMQ.CLI.Ctl.Commands.CloseConnectionCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate(args, _) when length(args) > 2, do: {:validation_failure, :too_many_args}
def validate(args, _) when length(args) < 2, do: {:validation_failure, :not_enough_args}

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/cluster_status_command.ex vendored
View File

@ -17,7 +17,6 @@
defmodule RabbitMQ.CLI.Ctl.Commands.ClusterStatusCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate(args, _) when length(args) != 0, do: {:validation_failure, :too_many_args}

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_user_command.ex vendored
View File

@ -20,7 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DeleteUserCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate(args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/delete_vhost_command.ex vendored
View File

@ -20,7 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.DeleteVhostCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/environment_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.EnvironmentCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def validate([_|_], _), do: {:validation_failure, :too_many_args}
def validate(_, _), do: :ok
def merge_defaults(args, opts), do: {args, opts}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/force_reset_command.ex vendored
View File

@ -16,7 +16,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.ForceResetCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

4
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/join_cluster_command.ex vendored
View File

@ -18,10 +18,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.JoinClusterCommand do
alias RabbitMQ.CLI.Core.Helpers, as: Helpers
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags [
:disc, # --disc is accepted for consistency's sake.
:ram
]
def switches() do
[

4
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_bindings_command.ex vendored
View File

@ -37,10 +37,10 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListBindingsCommand do
def merge_defaults([], opts) do
{~w(source_name source_kind
destination_name destination_kind
routing_key arguments), Map.merge(default_opts, opts)}
routing_key arguments), Map.merge(default_opts(), opts)}
end
def merge_defaults(args, opts) do
{args, Map.merge(default_opts, opts)}
{args, Map.merge(default_opts(), opts)}
end
def usage() do

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_global_parameters_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListGlobalParametersCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags []
def merge_defaults([], opts) do
{[], opts}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_operator_policies_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListOperatorPoliciesCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags [:vhost]
def scopes(), do: [:ctl, :diagnostics]

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_parameters_command.ex vendored
View File

@ -19,7 +19,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListParametersCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags [:vhost]
def merge_defaults([], opts) do
{[], Map.merge(%{vhost: "/"}, opts)}
end

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_permissions_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListPermissionsCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_policies_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListPoliciesCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags [:vhost]
def scopes(), do: [:ctl, :diagnostics]

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_queues_command.ex vendored
View File

@ -45,7 +45,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListQueuesCommand do
end
end
def merge_defaults([_|_] = args, opts) do
{args, Map.merge(default_opts, opts)}
{args, Map.merge(default_opts(), opts)}
end
def merge_defaults([], opts) do
merge_defaults(~w(name messages), opts)

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_topic_permissions_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListTopicPermissionsCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_permissions_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserPermissionsCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_topic_permissions_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserTopicPermissionsCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags []
def validate([], _), do: {:validation_failure, :not_enough_args}
def validate([_|_] = args, _) when length(args) > 1, do: {:validation_failure, :too_many_args}
def validate([_], _), do: :ok

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_users_command.ex vendored
View File

@ -19,7 +19,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUsersCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags []
def merge_defaults(args, opts), do: {args, opts}
def scopes(), do: [:ctl, :diagnostics]

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhosts_command.ex vendored
View File

@ -21,7 +21,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostsCommand do
use RabbitMQ.CLI.DefaultOutput
def formatter(), do: RabbitMQ.CLI.Formatters.Table
@flags []
@info_keys ~w(name tracing)a
def scopes(), do: [:ctl, :diagnostics]

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/purge_queue_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.PurgeQueueCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def usage, do: "purge_queue <queue>"

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/report_command.ex vendored
View File

@ -27,7 +27,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ReportCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def scopes(), do: [:ctl, :diagnostics]

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/reset_command.ex vendored
View File

@ -16,7 +16,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.ResetCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/rotate_logs_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.RotateLogsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_cluster_name_command.ex vendored
View File

@ -20,7 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetClusterNameCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_disk_free_limit_command.ex vendored
View File

@ -19,7 +19,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetDiskFreeLimitCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([], _) do

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_global_parameter_command.ex vendored
View File

@ -20,7 +20,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetGlobalParameterCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts) do
{args, opts}

1
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_parameter_command.ex vendored
View File

@ -20,7 +20,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetParameterCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(opts, %{vhost: "/"})}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_permissions_command.ex vendored
View File

@ -20,7 +20,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetPermissionsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_topic_permissions_command.ex vendored
View File

@ -20,7 +20,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetTopicPermissionsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def merge_defaults(args, opts) do
{args, Map.merge(%{vhost: "/"}, opts)}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_user_tags_command.ex vendored
View File

@ -20,7 +20,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetUserTagsCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([], _), do: {:validation_failure, :not_enough_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/set_vm_memory_high_watermark_command.ex vendored
View File

@ -19,7 +19,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SetVmMemoryHighWatermarkCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([], _) do

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/start_app_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.StartAppCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/status_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.StatusCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/stop_app_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.StopAppCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags []
def merge_defaults(args, opts), do: {args, opts}
def validate([_|_] = args, _) when length(args) > 0, do: {:validation_failure, :too_many_args}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/sync_queue_command.ex vendored
View File

@ -18,7 +18,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.SyncQueueCommand do
use RabbitMQ.CLI.DefaultOutput
def merge_defaults([_|_] = args, opts) do
{args, Map.merge(default_opts, opts)}
{args, Map.merge(default_opts(), opts)}
end
def usage, do: "sync_queue [-p <vhost>] queue"

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/trace_off_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.TraceOffCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def validate([_|_], _), do: {:validation_failure, :too_many_args}
def validate(_, _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/trace_on_command.ex vendored
View File

@ -17,7 +17,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.TraceOnCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
use RabbitMQ.CLI.DefaultOutput
@flags [:vhost]
def validate([_|_], _), do: {:validation_failure, :too_many_args}
def validate(_, _), do: :ok

2
deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/wait_command.ex vendored
View File

@ -16,7 +16,7 @@
defmodule RabbitMQ.CLI.Ctl.Commands.WaitCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@flags []
def merge_defaults(args, opts), do: {args, opts}

2
deps/rabbitmq_cli/lib/rabbitmq/cli/plugins/commands/list_command.ex vendored
View File

@ -26,7 +26,7 @@ defmodule RabbitMQ.CLI.Plugins.Commands.ListCommand do
use RabbitMQ.CLI.DefaultOutput
def merge_defaults([], opts), do: merge_defaults([".*"], opts)
def merge_defaults(args, opts), do: {args, Map.merge(default_opts, opts)}
def merge_defaults(args, opts), do: {args, Map.merge(default_opts(), opts)}
def switches(), do: [verbose: :boolean,
minimal: :boolean,

8
deps/rabbitmq_cli/lib/rabbitmqctl.ex vendored
View File

@ -102,7 +102,7 @@ defmodule RabbitMQCtl do
[_] -> nil
end;
# Skip remaining script names
(key, val) -> val
(_key, val) -> val
end)
end
@ -119,7 +119,7 @@ defmodule RabbitMQCtl do
|> merge_defaults_longnames
end
defp merge_defaults_node(%{} = opts), do: Map.merge(%{node: get_rabbit_hostname}, opts)
defp merge_defaults_node(%{} = opts), do: Map.merge(%{node: get_rabbit_hostname()}, opts)
defp merge_defaults_timeout(%{} = opts), do: Map.merge(%{timeout: :infinity}, opts)
@ -188,11 +188,11 @@ defmodule RabbitMQCtl do
module_name = String.to_atom("RabbitMQ.CLI.Printers." <> Macro.camelize(printer))
case Code.ensure_loaded(module_name) do
{:module, _} -> module_name;
{:error, :nofile} -> default_printer
{:error, :nofile} -> default_printer()
end
end
def get_printer(_) do
default_printer
default_printer()
end
def default_printer() do

2
deps/rabbitmq_cli/test/core/helpers_test.exs vendored
View File

@ -89,7 +89,7 @@ test "RabbitMQ hostname is properly formed" do
## ------------------- parse_node* tests --------------------
test "if nil input, retrieve standard rabbit hostname" do
assert @subject.parse_node(nil) == get_rabbit_hostname
assert @subject.parse_node(nil) == get_rabbit_hostname()
end
test "if input is an atom short name, return the atom with hostname" do