Skip to content

Commit 7bb8c75

Browse files
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)
1 parent 4793d6f commit 7bb8c75

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/rabbit_config.erl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ maybe_print_warning_for_running_app(kernel, Config) ->
9494
ConfigWithoutSupportedEntry = proplists:delete(net_ticktime, Config),
9595
case length(ConfigWithoutSupportedEntry) > 0 of
9696
true -> io:format(standard_error,
97-
"~nUnable to update config for app ~p from *.conf file."
98-
" App is already running. Use advanced.config instead.~n", [kernel]);
97+
"~nUnable to update config for app ~p from a .conf file."
98+
" The app is already running. Use advanced.config instead.~n", [kernel]);
9999
false -> ok
100100
end;
101101
maybe_print_warning_for_running_app(App, _Config) ->
102102
io:format(standard_error,
103-
"~nUnable to update config for app ~p from *.conf file."
104-
" App is already running. Use advanced.config instead.~n",
103+
"~nUnable to update config for app ~p from a .conf file: "
104+
" The app is already running.~n",
105105
[App]).
106106

107107
maybe_set_net_ticktime(undefined) ->
@@ -111,7 +111,11 @@ maybe_set_net_ticktime(KernelConfig) ->
111111
undefined ->
112112
ok;
113113
NetTickTime ->
114-
case net_kernel:set_net_ticktime(NetTickTime) of
114+
case net_kernel:set_net_ticktime(NetTickTime, 0) of
115+
unchanged ->
116+
ok;
117+
change_initiated ->
118+
ok;
115119
{ongoing_change_to, NewNetTicktime} ->
116120
io:format(standard_error,
117121
"~nCouldn't set net_ticktime to ~p "

0 commit comments

Comments
 (0)