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

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),

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