summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-01-11 10:52:01 +0000
committerEmile Joubert <emile@rabbitmq.com>2012-01-11 10:52:01 +0000
commit232f818f0d232ebc5ecf2f0516069f1b0f0eea45 (patch)
tree05b0039d9ea8c7e2dd575bf442f9c0beac344204
parentc6ce925d783a49d324fdec0d8398b0a7ce7d959e (diff)
downloadrabbitmq-server-232f818f0d232ebc5ecf2f0516069f1b0f0eea45.tar.gz
No timeout when calling
-rw-r--r--src/mnesia_sync.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mnesia_sync.erl b/src/mnesia_sync.erl
index c9dc1c1c..e80f9af6 100644
--- a/src/mnesia_sync.erl
+++ b/src/mnesia_sync.erl
@@ -38,10 +38,10 @@
%%----------------------------------------------------------------------------
start_link() ->
- gen_server2:start_link({local, ?SERVER}, ?MODULE, [], [{timeout, infinity}]).
+ gen_server2:start_link({local, ?SERVER}, ?MODULE, [], []).
sync() ->
- gen_server2:call(?SERVER, sync).
+ gen_server2:call(?SERVER, sync, infinity).
%%----------------------------------------------------------------------------
@@ -64,10 +64,10 @@ sync_proc(Waiting) ->
%%----------------------------------------------------------------------------
init([]) ->
- {ok, #state{sync_pid = case rabbit_mnesia:is_disc_node() of
- true -> proc_lib:spawn_link(fun sync_proc/0);
- false -> undefined
- end}}.
+ {ok, #state{sync_pid = case mnesia:system_info(use_dir) of
+ true -> proc_lib:spawn_link(fun sync_proc/0);
+ false -> undefined
+ end}}.
handle_call(sync, _From, #state{sync_pid = undefined} = State) ->
{reply, ok, State};