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

refactor(apps): Merge emqx_libs back to emqx 

And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency
This commit is contained in:
Zaiming Shi 2020-12-04 13:53:10 +01:00
parent 2cbd2bc800
commit 73d02beace
357 changed files with 365 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx/rebar.config
View File

@ -1 +0,0 @@
{deps, []}.

4
apps/emqx_auth_http/src/emqx_acl_http.erl
View File

@ -18,8 +18,8 @@
-include("emqx_auth_http.hrl"). -include("emqx_auth_http.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ACL http]"). -logger_header("[ACL http]").

2
apps/emqx_auth_http/src/emqx_auth_http.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_http_sup]}, {registered, [emqx_auth_http_sup]},
{applications, [kernel,stdlib,emqx_libs]}, {applications, [kernel,stdlib,emqx]},
{mod, {emqx_auth_http_app, []}}, {mod, {emqx_auth_http_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

6
apps/emqx_auth_http/src/emqx_auth_http.erl
View File

@ -18,9 +18,9 @@
-include("emqx_auth_http.hrl"). -include("emqx_auth_http.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-logger_header("[Auth http]"). -logger_header("[Auth http]").

2
apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl
View File

@ -17,7 +17,7 @@
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").

2
apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_jwt_sup]}, {registered, [emqx_auth_jwt_sup]},
{applications, [kernel,stdlib,jwerl,emqx_libs]}, {applications, [kernel,stdlib,jwerl,emqx]},
{mod, {emqx_auth_jwt_app, []}}, {mod, {emqx_auth_jwt_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_auth_jwt/src/emqx_auth_jwt.erl
View File

@ -16,8 +16,8 @@
-module(emqx_auth_jwt). -module(emqx_auth_jwt).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[JWT]"). -logger_header("[JWT]").

2
apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl
View File

@ -19,7 +19,7 @@
-compile(nowarn_export_all). -compile(nowarn_export_all).
-compile(export_all). -compile(export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

4
apps/emqx_auth_ldap/src/emqx_acl_ldap.erl
View File

@ -18,9 +18,9 @@
-include("emqx_auth_ldap.hrl"). -include("emqx_auth_ldap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eldap/include/eldap.hrl"). -include_lib("eldap/include/eldap.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check_acl/5 , check_acl/5

4
apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
View File

@ -2,8 +2,8 @@
[{description, "EMQ X Authentication/ACL with LDAP"}, [{description, "EMQ X Authentication/ACL with LDAP"},
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_ldap_sup,emqx_libs]}, {registered, [emqx_auth_ldap_sup]},
{applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd,emqx_libs]}, {applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd]},
{mod, {emqx_auth_ldap_app,[]}}, {mod, {emqx_auth_ldap_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_auth_ldap/src/emqx_auth_ldap.erl
View File

@ -18,9 +18,9 @@
-include("emqx_auth_ldap.hrl"). -include("emqx_auth_ldap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eldap/include/eldap.hrl"). -include_lib("eldap/include/eldap.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(proplists, [get_value/2]). -import(proplists, [get_value/2]).

4
apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl
View File

@ -20,8 +20,8 @@
-include("emqx_auth_ldap.hrl"). -include("emqx_auth_ldap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
%% ecpool callback %% ecpool callback
-export([connect/1]). -export([connect/1]).

2
apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl
View File

@ -19,7 +19,7 @@
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

2
apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl
View File

@ -19,7 +19,7 @@
-compile(export_all). -compile(export_all).
-compile(no_warning_export). -compile(no_warning_export).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

2
apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl
View File

@ -17,7 +17,7 @@
-module(emqx_acl_mnesia_cli). -module(emqx_acl_mnesia_cli).
-include("emqx_auth_mnesia.hrl"). -include("emqx_auth_mnesia.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/ms_transform.hrl").
-define(TABLE, emqx_acl). -define(TABLE, emqx_acl).

2
apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually {vsn, "4.3.0"}, % strict semver, bump manually
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel,stdlib,mnesia]}, {applications, [kernel,stdlib,mnesia,emqx]},
{mod, {emqx_auth_mnesia_app,[]}}, {mod, {emqx_auth_mnesia_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

6
apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl
View File

@ -18,9 +18,9 @@
-include("emqx_auth_mnesia.hrl"). -include("emqx_auth_mnesia.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/ms_transform.hrl").

2
apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl
View File

@ -17,7 +17,7 @@
-module(emqx_auth_mnesia_cli). -module(emqx_auth_mnesia_cli).
-include("emqx_auth_mnesia.hrl"). -include("emqx_auth_mnesia.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/ms_transform.hrl").
-define(TABLE, emqx_user). -define(TABLE, emqx_user).
%% Auth APIs %% Auth APIs

4
apps/emqx_auth_mongo/src/emqx_acl_mongo.erl
View File

@ -17,8 +17,8 @@
-module(emqx_acl_mongo). -module(emqx_acl_mongo).
-include("emqx_auth_mongo.hrl"). -include("emqx_auth_mongo.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
%% ACL callbacks %% ACL callbacks
-export([ register_metrics/0 -export([ register_metrics/0

2
apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_mongo_sup]}, {registered, [emqx_auth_mongo_sup]},
{applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd,emqx_libs]}, {applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd]},
{mod, {emqx_auth_mongo_app,[]}}, {mod, {emqx_auth_mongo_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

6
apps/emqx_auth_mongo/src/emqx_auth_mongo.erl
View File

@ -19,9 +19,9 @@
-behaviour(ecpool_worker). -behaviour(ecpool_worker).
-include("emqx_auth_mongo.hrl"). -include("emqx_auth_mongo.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check/3 , check/3

2
apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl
View File

@ -19,7 +19,7 @@
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").

4
apps/emqx_auth_mysql/src/emqx_acl_mysql.erl
View File

@ -18,8 +18,8 @@
-include("emqx_auth_mysql.hrl"). -include("emqx_auth_mysql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
%% ACL Callbacks %% ACL Callbacks
-export([ register_metrics/0 -export([ register_metrics/0

2
apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_mysql_sup]}, {registered, [emqx_auth_mysql_sup]},
{applications, [kernel,stdlib,mysql,ecpool,emqx_passwd,emqx_libs]}, {applications, [kernel,stdlib,mysql,ecpool,emqx_passwd]},
{mod, {emqx_auth_mysql_app,[]}}, {mod, {emqx_auth_mysql_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

6
apps/emqx_auth_mysql/src/emqx_auth_mysql.erl
View File

@ -18,9 +18,9 @@
-include("emqx_auth_mysql.hrl"). -include("emqx_auth_mysql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check/3 , check/3

4
apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl
View File

@ -19,8 +19,8 @@
-behaviour(ecpool_worker). -behaviour(ecpool_worker).
-include("emqx_auth_mysql.hrl"). -include("emqx_auth_mysql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ parse_query/1 -export([ parse_query/1
, connect/1 , connect/1

2
apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl
View File

@ -21,7 +21,7 @@
-define(APP, emqx_auth_mysql). -define(APP, emqx_auth_mysql).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

4
apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl
View File

@ -17,8 +17,8 @@
-module(emqx_acl_pgsql). -module(emqx_acl_pgsql).
-include("emqx_auth_pgsql.hrl"). -include("emqx_auth_pgsql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
%% ACL callbacks %% ACL callbacks
-export([ register_metrics/0 -export([ register_metrics/0

2
apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_pgsql_sup]}, {registered, [emqx_auth_pgsql_sup]},
{applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd,emqx_libs]}, {applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd]},
{mod, {emqx_auth_pgsql_app,[]}}, {mod, {emqx_auth_pgsql_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl
View File

@ -18,8 +18,8 @@
-include("emqx_auth_pgsql.hrl"). -include("emqx_auth_pgsql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check/3 , check/3

4
apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl
View File

@ -20,8 +20,8 @@
-include("emqx_auth_pgsql.hrl"). -include("emqx_auth_pgsql.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([connect/1]). -export([connect/1]).
-export([parse_query/2]). -export([parse_query/2]).

2
apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl
View File

@ -22,7 +22,7 @@
-define(APP, emqx_auth_pgsql). -define(APP, emqx_auth_pgsql).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").

4
apps/emqx_auth_redis/src/emqx_acl_redis.erl
View File

@ -18,8 +18,8 @@
-include("emqx_auth_redis.hrl"). -include("emqx_auth_redis.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check_acl/5 , check_acl/5

2
apps/emqx_auth_redis/src/emqx_auth_redis.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_redis_sup]}, {registered, [emqx_auth_redis_sup]},
{applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd,emqx_libs]}, {applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd]},
{mod, {emqx_auth_redis_app, []}}, {mod, {emqx_auth_redis_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_auth_redis/src/emqx_auth_redis.erl
View File

@ -18,8 +18,8 @@
-include("emqx_auth_redis.hrl"). -include("emqx_auth_redis.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ register_metrics/0 -export([ register_metrics/0
, check/3 , check/3

4
apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl
View File

@ -20,8 +20,8 @@
-include("emqx_auth_redis.hrl"). -include("emqx_auth_redis.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(proplists, [get_value/2, get_value/3]). -import(proplists, [get_value/2, get_value/3]).

2
apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl
View File

@ -18,7 +18,7 @@
-compile(export_all). -compile(export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

2
apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl
View File

@ -30,7 +30,7 @@
-type(topic() :: emqx_topic:topic()). -type(topic() :: emqx_topic:topic()).
-type(qos() :: emqx_mqtt_types:qos()). -type(qos() :: emqx_mqtt_types:qos()).
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[Bridge Connect]"). -logger_header("[Bridge Connect]").

2
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel,stdlib,replayq,emqtt,emqx_libs]}, {applications, [kernel,stdlib,replayq,emqtt,emqx]},
{mod, {emqx_bridge_mqtt_app, []}}, {mod, {emqx_bridge_mqtt_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl
View File

@ -31,8 +31,8 @@
, ensure_unsubscribed/2 , ensure_unsubscribed/2
]). ]).
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-define(ACK_REF(ClientPid, PktId), {ClientPid, PktId}). -define(ACK_REF(ClientPid, PktId), {ClientPid, PktId}).

4
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
View File

@ -18,8 +18,8 @@
-module(emqx_bridge_mqtt_actions). -module(emqx_bridge_mqtt_actions).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(emqx_rule_utils, [str/1]). -import(emqx_rule_utils, [str/1]).

2
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl
View File

@ -18,7 +18,7 @@
-behaviour(supervisor). -behaviour(supervisor).
-include("emqx_bridge_mqtt.hrl"). -include("emqx_bridge_mqtt.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[Bridge]"). -logger_header("[Bridge]").

2
apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl
View File

@ -27,7 +27,7 @@
-export_type([msg/0]). -export_type([msg/0]).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_bridge_mqtt/include/emqx_bridge_mqtt.hrl"). -include_lib("emqx_bridge_mqtt/include/emqx_bridge_mqtt.hrl").
-include_lib("emqtt/include/emqtt.hrl"). -include_lib("emqtt/include/emqtt.hrl").

4
apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl
View File

@ -110,8 +110,8 @@
-type ack_ref() :: term(). -type ack_ref() :: term().
-type topic() :: emqx_topic:topic(). -type topic() :: emqx_topic:topic().
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-logger_header("[Bridge]"). -logger_header("[Bridge]").

2
apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl
View File

@ -17,7 +17,7 @@
-module(emqx_bridge_mqtt_tests). -module(emqx_bridge_mqtt_tests).
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
send_and_ack_test() -> send_and_ack_test() ->
%% delegate from gen_rpc to rpc for unit test %% delegate from gen_rpc to rpc for unit test

4
apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl
View File

@ -25,8 +25,8 @@
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-define(wait(For, Timeout), emqx_ct_helpers:wait_for(?FUNCTION_NAME, ?LINE, fun() -> For end, Timeout)). -define(wait(For, Timeout), emqx_ct_helpers:wait_for(?FUNCTION_NAME, ?LINE, fun() -> For end, Timeout)).

4
apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl
View File

@ -18,8 +18,8 @@
-behaviour(emqx_bridge_connect). -behaviour(emqx_bridge_connect).
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-define(BRIDGE_NAME, test). -define(BRIDGE_NAME, test).
-define(BRIDGE_REG_NAME, emqx_bridge_worker_test). -define(BRIDGE_REG_NAME, emqx_bridge_worker_test).

2
apps/emqx_coap/src/emqx_coap.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel,stdlib,gen_coap,emqx_libs]}, {applications, [kernel,stdlib,gen_coap,emqx]},
{mod, {emqx_coap_app, []}}, {mod, {emqx_coap_app, []}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

8
apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl
View File

@ -20,10 +20,10 @@
-include("emqx_coap.hrl"). -include("emqx_coap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-logger_header("[CoAP-Adpter]"). -logger_header("[CoAP-Adpter]").

6
apps/emqx_coap/src/emqx_coap_ps_resource.erl
View File

@ -20,9 +20,9 @@
-include("emqx_coap.hrl"). -include("emqx_coap.hrl").
-include_lib("gen_coap/include/coap.hrl"). -include_lib("gen_coap/include/coap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[CoAP-PS-RES]"). -logger_header("[CoAP-PS-RES]").

6
apps/emqx_coap/src/emqx_coap_ps_topics.erl
View File

@ -19,9 +19,9 @@
-behaviour(gen_server). -behaviour(gen_server).
-include("emqx_coap.hrl"). -include("emqx_coap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[CoAP-PS-TOPICS]"). -logger_header("[CoAP-PS-TOPICS]").

2
apps/emqx_coap/src/emqx_coap_registry.erl
View File

@ -19,7 +19,7 @@
-author("Feng Lee <feng@emqx.io>"). -author("Feng Lee <feng@emqx.io>").
-include("emqx_coap.hrl"). -include("emqx_coap.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[CoAP-Registry]"). -logger_header("[CoAP-Registry]").

6
apps/emqx_coap/src/emqx_coap_resource.erl
View File

@ -19,9 +19,9 @@
-behaviour(coap_resource). -behaviour(coap_resource).
-include("emqx_coap.hrl"). -include("emqx_coap.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("gen_coap/include/coap.hrl"). -include_lib("gen_coap/include/coap.hrl").
-logger_header("[CoAP-RES]"). -logger_header("[CoAP-RES]").

2
apps/emqx_coap/test/emqx_coap_SUITE.erl
View File

@ -21,7 +21,7 @@
-include_lib("gen_coap/include/coap.hrl"). -include_lib("gen_coap/include/coap.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-define(LOGT(Format, Args), ct:pal(Format, Args)). -define(LOGT(Format, Args), ct:pal(Format, Args)).

2
apps/emqx_coap/test/emqx_coap_ps_SUITE.erl
View File

@ -21,7 +21,7 @@
-include_lib("gen_coap/include/coap.hrl"). -include_lib("gen_coap/include/coap.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-define(LOGT(Format, Args), ct:pal(Format, Args)). -define(LOGT(Format, Args), ct:pal(Format, Args)).

2
apps/emqx_dashboard/src/emqx_dashboard.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_dashboard_sup]}, {registered, [emqx_dashboard_sup]},
{applications, [kernel,stdlib,mnesia,minirest,emqx_libs]}, {applications, [kernel,stdlib,mnesia,minirest,emqx]},
{mod, {emqx_dashboard_app,[]}}, {mod, {emqx_dashboard_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_dashboard/src/emqx_dashboard.erl
View File

@ -16,8 +16,8 @@
-module(emqx_dashboard). -module(emqx_dashboard).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(proplists, [get_value/3]). -import(proplists, [get_value/3]).

2
apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl
View File

@ -26,7 +26,7 @@
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-define(CONTENT_TYPE, "application/x-www-form-urlencoded"). -define(CONTENT_TYPE, "application/x-www-form-urlencoded").

2
apps/emqx_exhook/src/emqx_exhook.app.src
View File

@ -4,7 +4,7 @@
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{mod, {emqx_exhook_app, []}}, {mod, {emqx_exhook_app, []}},
{applications, [kernel,stdlib,emqx_libs,grpcbox]}, {applications, [kernel,stdlib,emqx]},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQ X Team <contact@emqx.io>"]},

2
apps/emqx_exhook/src/emqx_exhook.erl
View File

@ -17,7 +17,7 @@
-module(emqx_exhook). -module(emqx_exhook).
-include("emqx_exhook.hrl"). -include("emqx_exhook.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExHook]"). -logger_header("[ExHook]").

4
apps/emqx_exhook/src/emqx_exhook_handler.erl
View File

@ -17,8 +17,8 @@
-module(emqx_exhook_handler). -module(emqx_exhook_handler).
-include("emqx_exhook.hrl"). -include("emqx_exhook.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExHook]"). -logger_header("[ExHook]").

2
apps/emqx_exhook/src/emqx_exhook_server.erl
View File

@ -16,7 +16,7 @@
-module(emqx_exhook_server). -module(emqx_exhook_server).
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExHook Svr]"). -logger_header("[ExHook Svr]").

2
apps/emqx_exproto/src/emqx_exproto.app.src
View File

@ -4,7 +4,7 @@
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{mod, {emqx_exproto_app, []}}, {mod, {emqx_exproto_app, []}},
{applications, [kernel,stdlib,grpcbox]}, {applications, [kernel,stdlib]},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQ X Team <contact@emqx.io>"]},

8
apps/emqx_exproto/src/emqx_exproto_channel.erl
View File

@ -17,10 +17,10 @@
-module(emqx_exproto_channel). -module(emqx_exproto_channel).
-include("emqx_exproto.hrl"). -include("emqx_exproto.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExProto Channel]"). -logger_header("[ExProto Channel]").

4
apps/emqx_exproto/src/emqx_exproto_conn.erl
View File

@ -17,8 +17,8 @@
%% TCP/TLS/UDP/DTLS Connection %% TCP/TLS/UDP/DTLS Connection
-module(emqx_exproto_conn). -module(emqx_exproto_conn).
-include_lib("emqx_libs/include/types.hrl"). -include_lib("emqx/include/types.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExProto Conn]"). -logger_header("[ExProto Conn]").

2
apps/emqx_exproto/src/emqx_exproto_gcli.erl
View File

@ -19,7 +19,7 @@
-behaviour(gen_server). -behaviour(gen_server).
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExProto gClient]"). -logger_header("[ExProto gClient]").

2
apps/emqx_exproto/src/emqx_exproto_gsvr.erl
View File

@ -20,7 +20,7 @@
-behavior(emqx_exproto_v_1_connection_adapter_bhvr). -behavior(emqx_exproto_v_1_connection_adapter_bhvr).
-include("emqx_exproto.hrl"). -include("emqx_exproto.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-logger_header("[ExProto gServer]"). -logger_header("[ExProto gServer]").

4
apps/emqx_exproto/test/emqx_exproto_SUITE.erl
View File

@ -31,8 +31,8 @@
, frame_disconnect/0 , frame_disconnect/0
]). ]).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-define(TCPOPTS, [binary, {active, false}]). -define(TCPOPTS, [binary, {active, false}]).
-define(DTLSOPTS, [binary, {active, false}, {protocol, dtls}]). -define(DTLSOPTS, [binary, {active, false}, {protocol, dtls}]).

19
apps/emqx_libs/.gitignore vendored
View File

@ -1,19 +0,0 @@
.rebar3
_*
.eunit
*.o
*.beam
*.plt
*.swp
*.swo
.erlang.cookie
ebin
log
erl_crash.dump
.rebar
logs
_build
.idea
*.iml
rebar3.crashdump
*~

9
apps/emqx_libs/README.md
View File

@ -1,9 +0,0 @@
emqx_libs
=====
Common libs for emqx
Build
-----
$ rebar3 compile

2
apps/emqx_libs/rebar.config
View File

@ -1,2 +0,0 @@
{erl_opts, [debug_info]}.
{deps, []}.

14
apps/emqx_libs/src/emqx_libs.app.src
View File

@ -1,14 +0,0 @@
{application, emqx_libs,
[{description, "EMQ X library"},
{vsn, "5.0"},
{registered, []},
{applications,
[kernel,
stdlib
]},
{env,[]},
{modules, []},
{licenses, ["Apache 2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]},
{links, []}
]}.

3
apps/emqx_libs/src/emqx_libs.erl
View File

@ -1,3 +0,0 @@
-module(emqx_libs).
-export([]).

2
apps/emqx_lua_hook/src/emqx_lua_hook.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel,stdlib,emqx_libs]}, {applications, [kernel,stdlib,emqx]},
{mod, {emqx_lua_hook_app,[]}}, {mod, {emqx_lua_hook_app,[]}},
{env,[]}, {env,[]},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_lua_hook/src/emqx_lua_script.erl
View File

@ -17,8 +17,8 @@
-module(emqx_lua_script). -module(emqx_lua_script).
-include("emqx_lua_hook.hrl"). -include("emqx_lua_hook.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-export([ register_on_message_publish/2 -export([ register_on_message_publish/2
, register_on_client_connected/2 , register_on_client_connected/2

4
apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl
View File

@ -19,8 +19,8 @@
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

2
apps/emqx_lwm2m/src/emqx_lwm2m.app.src
View File

@ -3,5 +3,5 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules,[]}, {modules,[]},
{registered,[emqx_lwm2m_sup]}, {registered,[emqx_lwm2m_sup]},
{applications,[kernel,stdlib,lwm2m_coap,emqx_libs]}, {applications,[kernel,stdlib,lwm2m_coap,emqx]},
{mod,{emqx_lwm2m_app,[]}}]}. {mod,{emqx_lwm2m_app,[]}}]}.

4
apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl
View File

@ -16,9 +16,9 @@
-module(emqx_lwm2m_coap_resource). -module(emqx_lwm2m_coap_resource).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("lwm2m_coap/include/coap.hrl"). -include_lib("lwm2m_coap/include/coap.hrl").

4
apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl
View File

@ -18,9 +18,9 @@
-include("emqx_lwm2m.hrl"). -include("emqx_lwm2m.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
%% API. %% API.
-export([ send_ul_data/3 -export([ send_ul_data/3

4
apps/emqx_lwm2m/test/test_mqtt_broker.erl
View File

@ -22,9 +22,9 @@
-record(state, {subscriber}). -record(state, {subscriber}).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").

2
apps/emqx_management/src/emqx_management.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_management_sup]}, {registered, [emqx_management_sup]},
{applications, [kernel,stdlib,minirest,emqx_libs]}, {applications, [kernel,stdlib,minirest,emqx]},
{mod, {emqx_mgmt_app,[]}}, {mod, {emqx_mgmt_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_management/src/emqx_mgmt.erl
View File

@ -19,8 +19,8 @@
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
-include_lib("stdlib/include/qlc.hrl"). -include_lib("stdlib/include/qlc.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-import(proplists, [get_value/2]). -import(proplists, [get_value/2]).

2
apps/emqx_management/src/emqx_mgmt_api_alarms.erl
View File

@ -18,7 +18,7 @@
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-rest_api(#{name => list_all_alarms, -rest_api(#{name => list_all_alarms,
method => 'GET', method => 'GET',

2
apps/emqx_management/src/emqx_mgmt_api_banned.erl
View File

@ -16,7 +16,7 @@
-module(emqx_mgmt_api_banned). -module(emqx_mgmt_api_banned).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").

4
apps/emqx_management/src/emqx_mgmt_api_clients.erl
View File

@ -18,8 +18,8 @@
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-import(minirest, [ return/0 -import(minirest, [ return/0
, return/1 , return/1

2
apps/emqx_management/src/emqx_mgmt_api_data.erl
View File

@ -16,7 +16,7 @@
-module(emqx_mgmt_api_data). -module(emqx_mgmt_api_data).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("kernel/include/file.hrl"). -include_lib("kernel/include/file.hrl").

2
apps/emqx_management/src/emqx_mgmt_api_plugins.erl
View File

@ -18,7 +18,7 @@
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-import(minirest, [return/1]). -import(minirest, [return/1]).

4
apps/emqx_management/src/emqx_mgmt_api_pubsub.erl
View File

@ -16,8 +16,8 @@
-module(emqx_mgmt_api_pubsub). -module(emqx_mgmt_api_pubsub).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").
-import(proplists, [ get_value/2 -import(proplists, [ get_value/2

2
apps/emqx_management/src/emqx_mgmt_api_routes.erl
View File

@ -16,7 +16,7 @@
-module(emqx_mgmt_api_routes). -module(emqx_mgmt_api_routes).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-import(minirest, [return/1]). -import(minirest, [return/1]).

2
apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl
View File

@ -16,7 +16,7 @@
-module(emqx_mgmt_api_subscriptions). -module(emqx_mgmt_api_subscriptions).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-import(minirest, [return/1]). -import(minirest, [return/1]).

4
apps/emqx_management/src/emqx_mgmt_cli.erl
View File

@ -16,8 +16,8 @@
-module(emqx_mgmt_cli). -module(emqx_mgmt_cli).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").

2
apps/emqx_management/src/emqx_mgmt_http.erl
View File

@ -25,7 +25,7 @@
-export([init/2]). -export([init/2]).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-define(APP, emqx_management). -define(APP, emqx_management).
-define(EXCEPT_PLUGIN, [emqx_dashboard]). -define(EXCEPT_PLUGIN, [emqx_dashboard]).

4
apps/emqx_management/test/emqx_mgmt_SUITE.erl
View File

@ -19,8 +19,8 @@
-compile(export_all). -compile(export_all).
-compile(nowarn_export_all). -compile(nowarn_export_all).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("common_test/include/ct.hrl"). -include_lib("common_test/include/ct.hrl").

4
apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
View File

@ -21,8 +21,8 @@
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/emqx_mqtt.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl").
-include("emqx_mgmt.hrl"). -include("emqx_mgmt.hrl").

2
apps/emqx_passwd/src/emqx_passwd.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, ['emqx_passwd']}, {modules, ['emqx_passwd']},
{registered, []}, {registered, []},
{applications, [kernel,stdlib,ssl,pbkdf2,bcrypt]}, {applications, [kernel,stdlib,ssl,pbkdf2,bcrypt,emqx]},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <contact@emqx.io>"]}, {maintainers, ["EMQ X Team <contact@emqx.io>"]},

2
apps/emqx_plugin_template/src/emqx_plugin_template.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_plugin_template_sup]}, {registered, [emqx_plugin_template_sup]},
{applications, [kernel,stdlib,emqx_libs]}, {applications, [kernel,stdlib,emqx]},
{mod, {emqx_plugin_template_app,[]}}, {mod, {emqx_plugin_template_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

2
apps/emqx_plugin_template/src/emqx_plugin_template.erl
View File

@ -16,7 +16,7 @@
-module(emqx_plugin_template). -module(emqx_plugin_template).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-export([ load/1 -export([ load/1
, unload/0 , unload/0

2
apps/emqx_prometheus/src/emqx_prometheus.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_prometheus_sup]}, {registered, [emqx_prometheus_sup]},
{applications, [kernel,stdlib,prometheus,emqx_libs]}, {applications, [kernel,stdlib,prometheus,emqx]},
{mod, {emqx_prometheus_app,[]}}, {mod, {emqx_prometheus_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

2
apps/emqx_psk_file/src/emqx_psk_file.app.src
View File

@ -3,7 +3,7 @@
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.0"}, % strict semver, bump manually!
{modules,[]}, {modules,[]},
{registered,[emqx_psk_file_sup]}, {registered,[emqx_psk_file_sup]},
{applications,[kernel,stdlib,emqx_libs]}, {applications,[kernel,stdlib,emqx]},
{mod,{emqx_psk_file_app,[]}}, {mod,{emqx_psk_file_app,[]}},
{env, []}, {env, []},
{licenses, ["Apache-2.0"]}, {licenses, ["Apache-2.0"]},

4
apps/emqx_psk_file/src/emqx_psk_file.erl
View File

@ -16,8 +16,8 @@
-module(emqx_psk_file). -module(emqx_psk_file).
-include_lib("emqx_libs/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("emqx_libs/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(proplists, [get_value/2]). -import(proplists, [get_value/2]).

Some files were not shown because too many files have changed in this diff Show More