diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-06-10 11:50:39 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-06-10 11:50:39 +0300 |
| commit | a3e4afb22877b0489fbb8c372e6b5c4c35ca274b (patch) | |
| tree | 14351570c83090dd45bf185f9e0d840cbb14ee96 | |
| parent | e758072e3d28581999b6a0b8aa7b91c3e1b538cb (diff) | |
| parent | 8531c9fe9fdb1655154e4381e606d3c3af381d83 (diff) | |
| download | rabbitmq-server-git-a3e4afb22877b0489fbb8c372e6b5c4c35ca274b.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_control_main.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 82c8d80a98..5a0ce17441 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -212,14 +212,11 @@ parse_timeout(N) when is_list(N) -> parse_timeout(N) -> {ok, N}. -format_timeout(N) when is_number(N) -> - float_to_list(N / 1000, [{decimals, 0}]). - announce_timeout(infinity, _Inform) -> %% no-op ok; announce_timeout(Timeout, Inform) when is_number(Timeout) -> - Inform("Timeout: ~s seconds", [format_timeout(Timeout)]), + Inform("Timeout: ~w seconds", [Timeout/1000]), ok. stop() -> |