diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2018-02-23 00:03:06 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-02-23 00:31:15 +0300 |
| commit | 0f023e97eb712e4989b47cb201a6a4838c985c63 (patch) | |
| tree | af84ab8c666e9e6c0bedd199dc6f41bee6aecf71 /src | |
| parent | 4cb22988960d73524f3bc71da340e4a3b066f3a1 (diff) | |
| download | rabbitmq-server-git-0f023e97eb712e4989b47cb201a6a4838c985c63.tar.gz | |
Address minor issues discovered in rabbit_config
* Handle more responses
* Don't emit confusing suggestions that rabbit (or plugin) setting should be set in the advanced.config file
as that won't change a thing (but it will for kernel)
(cherry picked from commit 7bb8c758a3eb4631b14caa8d637d7a1af8770281)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_config.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rabbit_config.erl b/src/rabbit_config.erl index 7333a4157a..de22d298be 100644 --- a/src/rabbit_config.erl +++ b/src/rabbit_config.erl @@ -94,14 +94,14 @@ maybe_print_warning_for_running_app(kernel, Config) -> ConfigWithoutSupportedEntry = proplists:delete(net_ticktime, Config), case length(ConfigWithoutSupportedEntry) > 0 of true -> io:format(standard_error, - "~nUnable to update config for app ~p from *.conf file." - " App is already running. Use advanced.config instead.~n", [kernel]); + "~nUnable to update config for app ~p from a .conf file." + " The app is already running. Use advanced.config instead.~n", [kernel]); false -> ok end; maybe_print_warning_for_running_app(App, _Config) -> io:format(standard_error, - "~nUnable to update config for app ~p from *.conf file." - " App is already running. Use advanced.config instead.~n", + "~nUnable to update config for app ~p from a .conf file: " + " The app is already running.~n", [App]). maybe_set_net_ticktime(undefined) -> @@ -111,7 +111,11 @@ maybe_set_net_ticktime(KernelConfig) -> undefined -> ok; NetTickTime -> - case net_kernel:set_net_ticktime(NetTickTime) of + case net_kernel:set_net_ticktime(NetTickTime, 0) of + unchanged -> + ok; + change_initiated -> + ok; {ongoing_change_to, NewNetTicktime} -> io:format(standard_error, "~nCouldn't set net_ticktime to ~p " |