diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-02-17 08:52:12 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-02-17 08:52:12 +0000 |
| commit | 9c35ddb67e49f4f2c146bc3d9ba30e18a4f67345 (patch) | |
| tree | 2973b07253650e13f2275cb9d24a8093de4c166b | |
| parent | 9380ad2409368a4205abe898de416056a8f251de (diff) | |
| download | rabbitmq-server-9c35ddb67e49f4f2c146bc3d9ba30e18a4f67345.tar.gz | |
s/now_millis/now_micros - so the name matches the function
spotted by John
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 0d8a4c92..e794b4aa 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -658,13 +658,13 @@ message_properties(#q{ttl=TTL}) -> #message_properties{expiry = calculate_msg_expiry(TTL)}. calculate_msg_expiry(undefined) -> undefined; -calculate_msg_expiry(TTL) -> now_millis() + (TTL * 1000). +calculate_msg_expiry(TTL) -> now_micros() + (TTL * 1000). drop_expired_messages(State = #q{ttl = undefined}) -> State; drop_expired_messages(State = #q{backing_queue_state = BQS, backing_queue = BQ}) -> - Now = now_millis(), + Now = now_micros(), BQS1 = BQ:dropwhile( fun (#message_properties{expiry = Expiry}) -> Now > Expiry @@ -685,7 +685,7 @@ ensure_ttl_timer(State = #q{backing_queue = BQ, ensure_ttl_timer(State) -> State. -now_millis() -> timer:now_diff(now(), {0,0,0}). +now_micros() -> timer:now_diff(now(), {0,0,0}). infos(Items, State) -> [{Item, i(Item, State)} || Item <- Items]. |