From e58611975293fff35c504d2716fbefe69c5d0906 Mon Sep 17 00:00:00 2001
From: terry-xiaoyu <506895667@qq.com>
Date: Sat, 31 Oct 2020 12:34:52 +0800
Subject: [PATCH] fix(project): point the hrl files to emqx_lib

---
 apps/emqx_auth_mongo/src/emqx_acl_mongo.erl            | 4 ++--
 apps/emqx_auth_mongo/src/emqx_auth_mongo.erl           | 6 +++---
 apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl       | 4 ++--
 apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl    | 2 +-
 apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl       | 4 ++--
 apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl    | 2 +-
 apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl | 4 ++--
 apps/emqx_exproto/test/emqx_exproto_SUITE.erl          | 4 ++--
 apps/emqx_rule_engine/src/emqx_rule_engine.erl         | 2 +-
 apps/emqx_rule_engine/src/emqx_rule_events.erl         | 4 ++--
 apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl  | 2 +-
 apps/emqx_telemetry/src/emqx_telemetry.erl             | 4 ++--
 apps/emqx_web_hook/src/emqx_web_hook.erl               | 4 ++--
 apps/emqx_web_hook/src/emqx_web_hook_actions.erl       | 4 ++--
 apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl        | 2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl b/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl
index c0ff5f8ac..1982b13d6 100644
--- a/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl
+++ b/apps/emqx_auth_mongo/src/emqx_acl_mongo.erl
@@ -17,8 +17,8 @@
 -module(emqx_acl_mongo).
 
 -include("emqx_auth_mongo.hrl").
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 %% ACL callbacks
 -export([ register_metrics/0
diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl b/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl
index 4880e6fb9..e0a5bb4ed 100644
--- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl
+++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.erl
@@ -19,9 +19,9 @@
 -behaviour(ecpool_worker).
 
 -include("emqx_auth_mongo.hrl").
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
--include_lib("emqx/include/types.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx_libs/include/types.hrl").
 
 -export([ register_metrics/0
         , check/3
diff --git a/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl b/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl
index c3ee3b02a..2868e83cc 100644
--- a/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl
+++ b/apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl
@@ -19,8 +19,8 @@
 -behaviour(ecpool_worker).
 
 -include("emqx_auth_mysql.hrl").
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -export([ parse_query/1
         , connect/1
diff --git a/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl b/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl
index 044655ac1..0d4c16e03 100644
--- a/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl
+++ b/apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl
@@ -21,7 +21,7 @@
 
 -define(APP, emqx_auth_mysql).
 
--include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 
diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl
index 27d25f35b..a748140ad 100644
--- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl
+++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl
@@ -20,8 +20,8 @@
 
 -include("emqx_auth_pgsql.hrl").
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -export([connect/1]).
 -export([parse_query/2]).
diff --git a/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl b/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl
index e4aefdcd3..8c3b53621 100644
--- a/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl
+++ b/apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl
@@ -22,7 +22,7 @@
 
 -define(APP, emqx_auth_pgsql).
 
--include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 
diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
index ca3bba095..bba790bbc 100644
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
@@ -18,8 +18,8 @@
 
 -module(emqx_bridge_mqtt_actions).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -import(emqx_rule_utils, [str/1]).
 
diff --git a/apps/emqx_exproto/test/emqx_exproto_SUITE.erl b/apps/emqx_exproto/test/emqx_exproto_SUITE.erl
index dc6a25c06..a5309b305 100644
--- a/apps/emqx_exproto/test/emqx_exproto_SUITE.erl
+++ b/apps/emqx_exproto/test/emqx_exproto_SUITE.erl
@@ -31,8 +31,8 @@
         , frame_disconnect/0
         ]).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx_mqtt.hrl").
 
 -define(TCPOPTS, [binary, {active, false}]).
 -define(DTLSOPTS, [binary, {active, false}, {protocol, dtls}]).
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/apps/emqx_rule_engine/src/emqx_rule_engine.erl
index 41b961230..30e08d67a 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl
@@ -17,7 +17,7 @@
 -module(emqx_rule_engine).
 
 -include("rule_engine.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -export([ load_providers/0
         , load_provider/1
diff --git a/apps/emqx_rule_engine/src/emqx_rule_events.erl b/apps/emqx_rule_engine/src/emqx_rule_events.erl
index 2ad383475..21c4a98e6 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_events.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_events.erl
@@ -16,8 +16,8 @@
 
 -module(emqx_rule_events).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -logger_header("[RuleEvents]").
 
diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
index 9836b96f0..78a0feb54 100644
--- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
+++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
@@ -20,7 +20,7 @@
 -compile(nowarn_export_all).
 
 -include_lib("emqx_rule_engine/include/rule_engine.hrl").
--include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
diff --git a/apps/emqx_telemetry/src/emqx_telemetry.erl b/apps/emqx_telemetry/src/emqx_telemetry.erl
index 0dbb2fc19..72fe8e510 100644
--- a/apps/emqx_telemetry/src/emqx_telemetry.erl
+++ b/apps/emqx_telemetry/src/emqx_telemetry.erl
@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
  -include_lib("kernel/include/file.hrl").
 
diff --git a/apps/emqx_web_hook/src/emqx_web_hook.erl b/apps/emqx_web_hook/src/emqx_web_hook.erl
index 3a6f785c7..5b25624be 100644
--- a/apps/emqx_web_hook/src/emqx_web_hook.erl
+++ b/apps/emqx_web_hook/src/emqx_web_hook.erl
@@ -16,8 +16,8 @@
 
 -module(emqx_web_hook).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -define(APP, emqx_web_hook).
 
diff --git a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl
index a2cb1dec5..a78d6c4f8 100644
--- a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl
+++ b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl
@@ -17,8 +17,8 @@
 %% Define the default actions.
 -module(emqx_web_hook_actions).
 
--include_lib("emqx/include/emqx.hrl").
--include_lib("emqx/include/logger.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx_libs/include/logger.hrl").
 
 -define(RESOURCE_TYPE_WEBHOOK, 'web_hook').
 -define(RESOURCE_CONFIG_SPEC, #{
diff --git a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl
index cd370a57b..87e5c63ad 100644
--- a/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl
+++ b/apps/emqx_web_hook/test/emqx_web_hook_SUITE.erl
@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx_libs/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").