Compability to emqxv4.0 (#129)

* Compability to emqxv4.0

* Rename proto to channel

* Remove test_mqtt_broker module

Author: HJianBo

.gitignore

@@ -21,3 +21,4 @@ rebar3.crashdump
 *.swp
 erlang.mk
 .rebar3/
+etc/emqx_coap.conf.rendered

TODO

@@ -1,4 +1,6 @@
-1. Remove the test/test_mqtt_broker and use emqx-ct-helpers
+1. Remove the test/test_mqtt_broker and use emqx-ct-helpers -> Done!
+    - Enhance all test case
+
 2. Remove the mqtt adaptor
 3. Remove the emqx_coap_ps_topics.erl
 

rebar.config

@@ -4,7 +4,9 @@
 
 {profiles,
  [{test, [{deps,
-           [ {er_coap_client, {git, "https://github.com/emqx/er_coap_client", {tag, "v1.0"}}}
+           [
+            {er_coap_client, {git, "https://github.com/emqx/er_coap_client", {tag, "v1.0"}}},
+            {emqx_ct_helpers, {git, "https://github.com/emqx/emqx-ct-helpers", {branch, "develop"}}}
            ]}]}
  ]}.
 

rebar.config.script

@@ -1,3 +1,5 @@
+%%-*- mode: erlang -*-
+
 CONFIG1 = case os:getenv("TRAVIS") of
               "true" ->
                   JobId = os:getenv("TRAVIS_JOB_ID"),

src/emqx_coap_mqtt_adapter.erl

@@ -20,6 +20,9 @@
 -include_lib("gen_coap/include/coap.hrl").
 -include_lib("emqx/include/emqx.hrl").
 -include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
+
+-logger_header("[CoAP-PS-RES]").
 
 -export([ coap_discover/2
         , coap_get/5
@@ -38,9 +41,6 @@
 
 -define(PS_PREFIX, [<<"ps">>]).
 
--define(LOG(Level, Format, Args),
-    logger:Level("CoAP-PS-RES: " ++ Format, Args)).
-
 %%--------------------------------------------------------------------
 %% Resource Callbacks
 %%--------------------------------------------------------------------
@@ -314,4 +314,4 @@ topic([Path | TopicPath]) ->
         <<>> -> Path;
         RemTopic ->
             <<Path/binary, $/, RemTopic/binary>>
-    end.
+    end.

src/emqx_coap_ps_resource.erl

@@ -19,6 +19,9 @@
 -include("emqx_coap.hrl").
 -include_lib("emqx/include/emqx.hrl").
 -include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
+
+-logger_header("[CoAP-PS-TOPICS]").
 
 -export([ start_link/0
         , stop/1
@@ -47,9 +50,6 @@
 
 -record(state, {}).
 
--define(LOG(Level, Format, Args),
-        emqx_logger:Level("CoAP-PS-TOPICS: " ++ Format, Args)).
-
 -define(COAP_TOPIC_TABLE, coap_topic).
 
 %%--------------------------------------------------------------------

src/emqx_coap_ps_topics.erl

@@ -17,6 +17,9 @@
 -author("Feng Lee <[email protected]>").
 
 -include("emqx_coap.hrl").
+-include_lib("emqx/include/logger.hrl").
+
+-logger_header("[CoAP-Registry]").
 
 -behaviour(gen_server).
 
@@ -43,10 +46,6 @@
 -define(RESPONSE_TAB, coap_response_process).
 -define(RESPONSE_REF_TAB, coap_response_process_ref).
 
--define(LOG(Level, Format, Args),
-    logger:Level("CoAP-REG: " ++ Format, Args)).
-
-
 %% ------------------------------------------------------------------
 %% API Function Definitions
 %% ------------------------------------------------------------------

src/emqx_coap_registry.erl

@@ -18,9 +18,12 @@
 
 -include("emqx_coap.hrl").
 -include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 -include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("gen_coap/include/coap.hrl").
 
+-logger_header("[CoAP-RES]").
+
 -export([ coap_discover/2
         , coap_get/5
         , coap_post/4
@@ -38,9 +41,6 @@
 
 -define(MQTT_PREFIX, [<<"mqtt">>]).
 
--define(LOG(Level, Format, Args),
-    logger:Level("CoAP-RES: " ++ Format, Args)).
-
 % resource operations
 coap_discover(_Prefix, _Args) ->
     [{absolute, [<<"mqtt">>], []}].