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

Merge branch 'dev' of github.com:emqtt/emqtt into dev

This commit is contained in:
Feng Lee 2015-07-28 11:24:51 +08:00
parent b701c9ec4f ca075f8f21
commit d52dcd94d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_message.erl
View File

@ -59,7 +59,7 @@ make(From, Topic, Payload) ->
Topic :: binary(), Topic :: binary(),
Payload :: binary(). Payload :: binary().
make(From, Qos, Topic, Payload) -> make(From, Qos, Topic, Payload) ->
#mqtt_message{msgid = msgid(Qos), #mqtt_message{msgid = msgid(?QOS_I(Qos)),
topic = Topic, topic = Topic,
from = From, from = From,
qos = ?QOS_I(Qos), qos = ?QOS_I(Qos),

4
src/emqttd_pooler.erl
View File

@ -51,14 +51,14 @@ start_link(I) ->
%% @end %% @end
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
submit(Fun) -> submit(Fun) ->
gen_server:call(gproc_pool:pick(pooler), {submit, Fun}, infinity). gen_server:call(gproc_pool:pick_worker(pooler), {submit, Fun}, infinity).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
%% @doc Submit work to pooler asynchronously %% @doc Submit work to pooler asynchronously
%% @end %% @end
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
async_submit(Fun) -> async_submit(Fun) ->
gen_server:cast(gproc_pool:pick(pooler), {async_submit, Fun}). gen_server:cast(gproc_pool:pick_worker(pooler), {async_submit, Fun}).
%%%============================================================================= %%%=============================================================================
%%% gen_server callbacks %%% gen_server callbacks