diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-08-31 12:10:08 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-08-31 12:10:08 +0100 |
| commit | 875739bda3f3008c525af416c69b905cc8105873 (patch) | |
| tree | 31f2e55c4bb05c15b5140ef8c2defaf566cbfa21 | |
| parent | 6043adeafcd2a0e28ebb0b62ee9a34200fb02724 (diff) | |
| download | rabbitmq-server-875739bda3f3008c525af416c69b905cc8105873.tar.gz | |
Change type of expires argument from (signed)long to signedint since that's the best we can do in 0-8.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 0cdb4fff..17accb6d 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -56,7 +56,7 @@ -include("rabbit.hrl"). -include_lib("stdlib/include/qlc.hrl"). --define(EXPIRES_TYPE, long). +-define(EXPIRES_TYPE, signedint). %%---------------------------------------------------------------------------- @@ -318,8 +318,8 @@ check_expires_argument({?EXPIRES_TYPE, Expires}) ok; check_expires_argument({?EXPIRES_TYPE, _Expires}) -> {error, expires_zero_or_less}; -check_expires_argument(_) -> - {error, expires_not_of_type_long}. +check_expires_argument(Arg) -> + {error, {expires_not_of_type_int, Arg}}. list(VHostPath) -> mnesia:dirty_match_object( diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 2cab7136..8bb56da5 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -146,8 +146,8 @@ code_change(_OldVsn, State, _Extra) -> init_expires(State = #q{q = #amqqueue{arguments = Arguments}}) -> case rabbit_misc:table_lookup(Arguments, <<"x-expires">>) of - {long, Expires} -> ensure_expiry_timer(State#q{expires = Expires}); - undefined -> State + {signedint, Expires} -> ensure_expiry_timer(State#q{expires = Expires}); + undefined -> State end. declare(Recover, From, |