summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-07-23 14:05:32 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2020-07-23 15:04:55 +0200
commitb076c739ed7dc7c304d9f16b7bedeafea4cc3225 (patch)
treef8191b09a223e2f2aac65eeae52907ad517aa448
parentf4d0243d66a619dc7a9aa32117e694362c47457d (diff)
downloadrabbitmq-server-git-b076c739ed7dc7c304d9f16b7bedeafea4cc3225.tar.gz
rabbit_prelaunch_errors, rabbit_core_ff: Fix style consistency
-rw-r--r--apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl8
-rw-r--r--src/rabbit_core_ff.erl31
2 files changed, 22 insertions, 17 deletions
diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
index 4c2b4d887e..b2cc03d069 100644
--- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
+++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
@@ -30,11 +30,13 @@ format_error({error, {invalid_dist_port_range, DistTcpPort}}) ->
"Invalid Erlang distribution TCP port: ~b", [DistTcpPort]);
format_error({error, {dist_port_already_used, Port, not_erlang, Host}}) ->
rabbit_misc:format(
- "ERROR: could not bind to distribution port ~b on host ~s. It could be in use "
- "by another process or cannot be bound to (e.g. due to a security policy)", [Port, Host]);
+ "ERROR: could not bind to distribution port ~b on host ~s. It could "
+ "be in use by another process or cannot be bound to (e.g. due to a "
+ "security policy)", [Port, Host]);
format_error({error, {dist_port_already_used, Port, Name, Host}}) ->
rabbit_misc:format(
- "ERROR: could not bind to distribution port ~b, it is in use by another node: ~s@~s", [Port, Name, Host]);
+ "ERROR: could not bind to distribution port ~b, it is in use by "
+ "another node: ~s@~s", [Port, Name, Host]);
format_error({error, {erlang_dist_running_with_unexpected_nodename,
Unexpected, Node}}) ->
rabbit_misc:format(
diff --git a/src/rabbit_core_ff.erl b/src/rabbit_core_ff.erl
index f97170f6ac..63aa9b30f1 100644
--- a/src/rabbit_core_ff.erl
+++ b/src/rabbit_core_ff.erl
@@ -36,12 +36,11 @@
}}).
-rabbit_feature_flag(
- {maintenance_mode_status,
- #{
- desc => "Maintenance mode status",
- stability => stable,
- migration_fun => {?MODULE, maintenance_mode_status_migration}
- }}).
+ {maintenance_mode_status,
+ #{desc => "Maintenance mode status",
+ stability => stable,
+ migration_fun => {?MODULE, maintenance_mode_status_migration}
+ }}).
%% -------------------------------------------------------------------
%% Quorum queues.
@@ -106,7 +105,6 @@ remove_explicit_default_bindings(FeatureName, Queues) ->
|| Q <- Queues],
ok.
-
%% -------------------------------------------------------------------
%% Virtual host metadata.
%% -------------------------------------------------------------------
@@ -122,19 +120,24 @@ virtual_host_metadata_migration(_FeatureName, _FeatureProps, enable) ->
virtual_host_metadata_migration(_FeatureName, _FeatureProps, is_enabled) ->
mnesia:table_info(rabbit_vhost, attributes) =:= vhost:fields(vhost_v2).
-
-%%
-%% Maintenance mode
-%%
+%% -------------------------------------------------------------------
+%% Maintenance mode.
+%% -------------------------------------------------------------------
maintenance_mode_status_migration(FeatureName, _FeatureProps, enable) ->
TableName = rabbit_maintenance:status_table_name(),
- rabbit_log:info("Creating table ~s for feature flag `~s`", [TableName, FeatureName]),
+ rabbit_log:info(
+ "Creating table ~s for feature flag `~s`",
+ [TableName, FeatureName]),
try
- _ = rabbit_table:create(TableName, rabbit_maintenance:status_table_definition()),
+ _ = rabbit_table:create(
+ TableName,
+ rabbit_maintenance:status_table_definition()),
_ = rabbit_table:ensure_table_copy(TableName, node())
catch throw:Reason ->
- rabbit_log:error("Failed to create maintenance status table: ~p", [Reason])
+ rabbit_log:error(
+ "Failed to create maintenance status table: ~p",
+ [Reason])
end;
maintenance_mode_status_migration(_FeatureName, _FeatureProps, is_enabled) ->
rabbit_table:exists(rabbit_maintenance:status_table_name()).