From c276b6c6d15aeb52c09b19f3f010de648ec6a09f Mon Sep 17 00:00:00 2001 From: Feng Date: Tue, 28 Jul 2015 10:52:10 +0800 Subject: [PATCH 1/2] QOS_I --- src/emqttd_message.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl index 8f3d4ed40..d8e55e202 100644 --- a/src/emqttd_message.erl +++ b/src/emqttd_message.erl @@ -59,7 +59,7 @@ make(From, Topic, Payload) -> Topic :: binary(), Payload :: binary(). make(From, Qos, Topic, Payload) -> - #mqtt_message{msgid = msgid(Qos), + #mqtt_message{msgid = msgid(?QOS_I(Qos)), topic = Topic, from = From, qos = ?QOS_I(Qos), From ca075f8f21c2fe76c97541172cbb167621d71e16 Mon Sep 17 00:00:00 2001 From: Feng Date: Tue, 28 Jul 2015 11:05:50 +0800 Subject: [PATCH 2/2] pick_worker --- src/emqttd_pooler.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emqttd_pooler.erl b/src/emqttd_pooler.erl index b284c240e..3f0245250 100644 --- a/src/emqttd_pooler.erl +++ b/src/emqttd_pooler.erl @@ -51,14 +51,14 @@ start_link(I) -> %% @end %%------------------------------------------------------------------------------ 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 %% @end %%------------------------------------------------------------------------------ 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