diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-03 17:44:49 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-03 17:44:49 +0000 |
| commit | 131a372469e596372788188e66e8ba84ce006057 (patch) | |
| tree | 945f2c22af113a192e6631069788600d4da2c323 | |
| parent | 02699af969939bef5c934024b21411e10d92567c (diff) | |
| download | rabbitmq-server-bug23374.tar.gz | |
Don't, ah, depend on the management plugin.bug23374
| -rw-r--r-- | src/rabbit_external_stats.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/rabbit_external_stats.erl b/src/rabbit_external_stats.erl index 7c64e913..b6a15f9f 100644 --- a/src/rabbit_external_stats.erl +++ b/src/rabbit_external_stats.erl @@ -149,7 +149,7 @@ init([]) -> handle_call({info, Items}, _From, State0) -> - State = case (rabbit_mgmt_util:now_ms() - State0#state.time_ms > + State = case (rabbit_misc:now_ms() - State0#state.time_ms > ?REFRESH_RATIO) of true -> internal_update(State0); false -> State0 @@ -173,5 +173,5 @@ code_change(_, State, _) -> {ok, State}. %%-------------------------------------------------------------------- internal_update(State) -> - State#state{time_ms = rabbit_mgmt_util:now_ms(), - fd_used = get_used_fd()}. + State#state{time_ms = rabbit_misc:now_ms(), + fd_used = get_used_fd()}. diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 086d260e..afcdae77 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -64,6 +64,7 @@ -export([recursive_delete/1, dict_cons/3, orddict_cons/3, unlink_and_capture_exit/1]). -export([get_options/2]). +-export([now_ms/0]). -import(mnesia). -import(lists). @@ -184,6 +185,7 @@ -spec(unlink_and_capture_exit/1 :: (pid()) -> 'ok'). -spec(get_options/2 :: ([optdef()], [string()]) -> {[string()], [{string(), any()}]}). +-spec(now_ms/0 :: () -> integer()). -endif. @@ -721,3 +723,6 @@ get_flag(K, [Nk | As]) -> {[Nk | As1], V}; get_flag(_, []) -> {[], false}. + +now_ms() -> + timer:now_diff(now(), {0,0,0}) div 1000. |