yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add '{backoff, 1000, 1000, 10000}' to return of init/1

This commit is contained in:
Feng 2017-02-22 23:07:27 +08:00
parent b8084f2989
commit 239cf1b5fc
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emqttd_bridge.erl
View File

@ -40,16 +40,16 @@
qos = ?QOS_2, qos = ?QOS_2,
topic_suffix = <<>>, topic_suffix = <<>>,
topic_prefix = <<>>, topic_prefix = <<>>,
mqueue :: emqttd_mqueue:mqueue(), mqueue :: emqttd_mqueue:mqueue(),
max_queue_len = 10000, max_queue_len = 10000,
ping_down_interval = ?PING_DOWN_INTERVAL, ping_down_interval = ?PING_DOWN_INTERVAL,
status = up}). status = up}).
-type(option() :: {qos, mqtt_qos()} | -type(option() :: {qos, mqtt_qos()} |
{topic_suffix, binary()} | {topic_suffix, binary()} |
{topic_prefix, binary()} | {topic_prefix, binary()} |
{max_queue_len, pos_integer()} | {max_queue_len, pos_integer()} |
{ping_down_interval, pos_integer()}). {ping_down_interval, pos_integer()}).
-export_type([option/0]). -export_type([option/0]).
@ -79,9 +79,10 @@ init([Pool, Id, Node, Topic, Options]) ->
MQueue = emqttd_mqueue:new(qname(Node, Topic), MQueue = emqttd_mqueue:new(qname(Node, Topic),
[{max_len, State#state.max_queue_len}], [{max_len, State#state.max_queue_len}],
emqttd_alarm:alarm_fun()), emqttd_alarm:alarm_fun()),
{ok, State#state{pool = Pool, id = Id, mqueue = MQueue}}; {ok, State#state{pool = Pool, id = Id, mqueue = MQueue}, hibernate,
{backoff, 1000, 1000, 10000}};
false -> false ->
{stop, {cannot_connect, Node}} {stop, {cannot_connect_node, Node}}
end. end.
parse_opts([], State) -> parse_opts([], State) ->

7
src/emqttd_pubsub.erl
View File

@ -164,11 +164,12 @@ pick(Subscriber) ->
init([Pool, Id, Env]) -> init([Pool, Id, Env]) ->
?GPROC_POOL(join, Pool, Id), ?GPROC_POOL(join, Pool, Id),
{ok, #state{pool = Pool, id = Id, env = Env}}. {ok, #state{pool = Pool, id = Id, env = Env}, hibernate,
{backoff, 2000, 2000, 20000}}.
handle_call({subscribe, Topic, Subscriber, Options}, _From, State) -> handle_call({subscribe, Topic, Subscriber, Options}, _From, State) ->
add_subscriber(Topic, Subscriber, Options), add_subscriber(Topic, Subscriber, Options),
{reply, ok, setstats(State)}; {reply, ok, setstats(State), hibernate};
handle_call({unsubscribe, Topic, Subscriber, Options}, _From, State) -> handle_call({unsubscribe, Topic, Subscriber, Options}, _From, State) ->
del_subscriber(Topic, Subscriber, Options), del_subscriber(Topic, Subscriber, Options),
@ -179,7 +180,7 @@ handle_call(Req, _From, State) ->
handle_cast({subscribe, Topic, Subscriber, Options}, State) -> handle_cast({subscribe, Topic, Subscriber, Options}, State) ->
add_subscriber(Topic, Subscriber, Options), add_subscriber(Topic, Subscriber, Options),
{noreply, setstats(State)}; {noreply, setstats(State), hibernate};
handle_cast({unsubscribe, Topic, Subscriber, Options}, State) -> handle_cast({unsubscribe, Topic, Subscriber, Options}, State) ->
del_subscriber(Topic, Subscriber, Options), del_subscriber(Topic, Subscriber, Options),