summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-03-23 19:11:23 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-03-23 19:12:40 +0300
commit2259ab4208eedc3ac5f7955f17b737bb1eaecf27 (patch)
treea5800b591f7c25eca5f4f7451d38593908df80b2
parentc1ef21206383a3a5725f6cf8dd30d3aa24013aca (diff)
downloadrabbitmq-server-git-2259ab4208eedc3ac5f7955f17b737bb1eaecf27.tar.gz
Inline, don't reinvent rabbit_misc:get_env/3
-rw-r--r--src/rabbit_mirror_queue_master.erl9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index e7afe88483..e447e9de82 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -132,14 +132,7 @@ init_with_existing_bq(Q = #amqqueue{name = QName}, BQ, BQS) ->
seen_status = dict:new(),
confirmed = [],
known_senders = sets:new(),
- wait_timeout = get_slave_wait_timeout() }.
-
-get_slave_wait_timeout() ->
- case application:get_env(rabbit, slave_wait_timeout) of
- {ok, T} -> T;
- undefined -> 15000
- end.
-
+ wait_timeout = rabbit_misc:get_env(rabbit, slave_wait_timeout, 15000) }.
stop_mirroring(State = #state { coordinator = CPid,
backing_queue = BQ,