diff options
| author | Alexey Lebedeff <alebedev@mirantis.com> | 2016-07-13 18:15:04 +0300 |
|---|---|---|
| committer | Alexey Lebedeff <alebedev@mirantis.com> | 2016-07-14 13:39:17 +0300 |
| commit | 7b36b7ff75d5d7cea98b40690fd7b19c983b9c5c (patch) | |
| tree | 43a466339d1d7798552af6441fd91eae555e4824 /include | |
| parent | 3448f97e0ab6c6978066f937a14d467ad9b2d6ca (diff) | |
| download | rabbitmq-server-git-7b36b7ff75d5d7cea98b40690fd7b19c983b9c5c.tar.gz | |
Default timeouts: fix global/add per-command
- Global timeout `?RPC_TIMEOUT` was not used, because default value of
infinity was always introduced via `?TIMEOUT_DEF`. Now `infinity` is
used for commands without timeout support, and `?RPC_TIMEOUT`
otherwise.
- `?COMMANDS_WITH_TIMEOUT` now can contain per-command default values
for timeout, using tuple `{Command, DefaultTimeoutInMilliSeconds}`
instead of just `Command`.
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_cli.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index 7f5db6053b..a0d1ecfdd5 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -34,7 +34,7 @@ -define(NODE_DEF(Node), {?NODE_OPT, {option, Node}}). -define(QUIET_DEF, {?QUIET_OPT, flag}). -define(VHOST_DEF, {?VHOST_OPT, {option, "/"}}). --define(TIMEOUT_DEF, {?TIMEOUT_OPT, {option, "infinity"}}). +-define(TIMEOUT_DEF, {?TIMEOUT_OPT, {option, use_default}}). -define(VERBOSE_DEF, {?VERBOSE_OPT, flag}). -define(MINIMAL_DEF, {?MINIMAL_OPT, flag}). |