diff options
| author | dcorbacho <dparracorbacho@piotal.io> | 2019-09-23 17:30:06 +0100 |
|---|---|---|
| committer | dcorbacho <dparracorbacho@piotal.io> | 2019-09-23 17:30:06 +0100 |
| commit | 805c6715faf70b43f3e950c10390a66ec47309a1 (patch) | |
| tree | f5eee5b3d5677697bd8d2e6237ab1661a604ae8d /src | |
| parent | 6116a11cb25575a734f16074070418e805045c1d (diff) | |
| parent | edf98f35087da9f67cea8629cce1a1130299acaf (diff) | |
| download | rabbitmq-server-git-805c6715faf70b43f3e950c10390a66ec47309a1.tar.gz | |
Merge remote-tracking branch 'origin' into consume-events-command
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 29cd145330..7095966ced 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -1040,8 +1040,10 @@ boot_error(_, {error, {cannot_log_to_file, LogFile, Reason}}) -> [LogFile, Reason]); boot_error(_, {error, {generate_config_file, Error}}) -> log_boot_error_and_exit(generate_config_file, - "~nConfig file generation failed:~n~s~n", - [Error]); + "~nConfig file generation failed:~n~s" + "In case the setting comes from a plugin, make sure that the plugin is enabled.~n" + "Alternatively remove the setting from the config.~n", + [Error]); boot_error(Class, Reason) -> LogLocations = log_locations(), log_boot_error_and_exit( diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 6988f6614a..540e0789ca 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -526,7 +526,7 @@ is_match(Subj, E) -> iterative_rebalance(ByNode, MaxQueuesDesired) -> case maybe_migrate(ByNode, MaxQueuesDesired) of {ok, Summary} -> - rabbit_log:warning("Nothing to do, all balanced"), + rabbit_log:info("All queue masters are balanced"), {ok, Summary}; {migrated, Other} -> iterative_rebalance(Other, MaxQueuesDesired); |