summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-08-04 17:58:48 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-08-04 17:58:48 +0100
commitb995babde5495ab939348f87da6e63141b71943d (patch)
treee0ae072f938e90c147f53749ef51ead5168b5135
parentd8946b6fa73179076e0fba3694f6efb9d72cabe3 (diff)
downloadrabbitmq-server-bug23071.tar.gz
Use now() instead of os:timestamp() for compatibility. now() uses a per-node lock, which is not great, but this is only invoked on lifecycle events, plus every few seconds per queue / channel / connection when the stats level is > none.bug23071
-rw-r--r--src/rabbit_event.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl
index 07027cd5..e654b34a 100644
--- a/src/rabbit_event.erl
+++ b/src/rabbit_event.erl
@@ -120,9 +120,10 @@ stats_level(#state{level = Level}) ->
notify(Type, Props) ->
try
+ %% TODO: when we no longer support 12B3, switch to os:timestamp()
gen_event:notify(rabbit_event, #event{type = Type,
props = Props,
- timestamp = os:timestamp()})
+ timestamp = now()})
catch error:badarg ->
%% badarg means rabbit_event is no longer registered. We never
%% unregister it so the great likelihood is that we're shutting