diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-05 14:05:51 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-05 14:05:51 +0000 |
| commit | 6e0c2971c7c1a30fef0bc895adc79d437c99c733 (patch) | |
| tree | e6c226ad9082eae2ead87d550db78738ad5c7d89 | |
| parent | 629e5ac496f858351899e595134ee175e92e0060 (diff) | |
| parent | 2bd9ee1f5846625d7d3776be3f1a3972b707a394 (diff) | |
| download | rabbitmq-server-git-6e0c2971c7c1a30fef0bc895adc79d437c99c733.tar.gz | |
Merged bug23299 (Erlang internode communication fails with user_sup undefined)
| -rw-r--r-- | src/rabbit_misc.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 086d260e24..e5c30c0606 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 :: () -> non_neg_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. |