From 5d59ac1f023c409ceaa43297d9ed16fc87e73bd3 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 31 Jul 2021 18:52:05 +0200 Subject: [PATCH] refactor(logging): delete log headers from all modules --- apps/emqx/src/emqx.erl | 1 - apps/emqx/src/emqx_alarm.erl | 2 -- apps/emqx/src/emqx_alarm_handler.erl | 1 - apps/emqx/src/emqx_banned.erl | 1 - apps/emqx/src/emqx_broker.erl | 1 - apps/emqx/src/emqx_broker_helper.erl | 1 - apps/emqx/src/emqx_channel.erl | 1 - apps/emqx/src/emqx_cm.erl | 1 - apps/emqx/src/emqx_cm_registry.erl | 1 - apps/emqx/src/emqx_connection.erl | 1 - apps/emqx/src/emqx_ctl.erl | 1 - apps/emqx/src/emqx_flapping.erl | 4 +--- apps/emqx/src/emqx_hooks.erl | 1 - apps/emqx/src/emqx_metrics.erl | 1 - apps/emqx/src/emqx_os_mon.erl | 1 - apps/emqx/src/emqx_plugins.erl | 1 - apps/emqx/src/emqx_pool.erl | 1 - apps/emqx/src/emqx_psk.erl | 1 - apps/emqx/src/emqx_router.erl | 1 - apps/emqx/src/emqx_router_helper.erl | 1 - apps/emqx/src/emqx_session.erl | 1 - apps/emqx/src/emqx_shared_sub.erl | 1 - apps/emqx/src/emqx_stats.erl | 1 - apps/emqx/src/emqx_sys.erl | 1 - apps/emqx/src/emqx_sys_mon.erl | 1 - apps/emqx/src/emqx_tracer.erl | 1 - apps/emqx/src/emqx_ws_connection.erl | 1 - apps/emqx_authz/src/emqx_authz.erl | 1 - apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl | 1 - apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl | 1 - apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl | 1 - .../src/coap/resources/emqx_coap_mqtt_resource.erl | 1 - .../src/coap/resources/emqx_coap_pubsub_resource.erl | 1 - .../src/coap/resources/emqx_coap_pubsub_topics.erl | 1 - apps/emqx_gateway/src/emqx_gateway_app.erl | 1 - apps/emqx_gateway/src/emqx_gateway_cm.erl | 1 - apps/emqx_gateway/src/emqx_gateway_cm_registry.erl | 1 - apps/emqx_gateway/src/emqx_gateway_ctx.erl | 1 - apps/emqx_gateway/src/emqx_gateway_insta_sup.erl | 1 - apps/emqx_gateway/src/emqx_gateway_metrics.erl | 1 - apps/emqx_gateway/src/emqx_gateway_registry.erl | 1 - apps/emqx_gateway/src/exhook/emqx_exhook.erl | 1 - apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl | 1 - apps/emqx_gateway/src/exhook/emqx_exhook_server.erl | 1 - apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl | 1 - apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl | 1 - apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl | 1 - apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl | 1 - apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl | 1 - apps/emqx_modules/src/emqx_delayed.erl | 1 - apps/emqx_modules/src/emqx_topic_metrics.erl | 1 - apps/emqx_retainer/src/emqx_retainer.erl | 1 - apps/emqx_retainer/src/emqx_retainer_mnesia.erl | 1 - apps/emqx_rule_engine/src/emqx_rule_engine_api.erl | 1 - apps/emqx_rule_engine/src/emqx_rule_events.erl | 1 - apps/emqx_rule_engine/src/emqx_rule_monitor.erl | 1 - 56 files changed, 1 insertion(+), 59 deletions(-) diff --git a/apps/emqx/src/emqx.erl b/apps/emqx/src/emqx.erl index 3530f0dfb..f22b33acc 100644 --- a/apps/emqx/src/emqx.erl +++ b/apps/emqx/src/emqx.erl @@ -20,7 +20,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[EMQ X]"). %% Start/Stop the application -export([ start/0 diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl index 223d5aa50..ab3e2d702 100644 --- a/apps/emqx/src/emqx_alarm.erl +++ b/apps/emqx/src/emqx_alarm.erl @@ -22,8 +22,6 @@ -include("emqx.hrl"). -include("logger.hrl"). --logger_header("[Alarm Handler]"). - %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_alarm_handler.erl b/apps/emqx/src/emqx_alarm_handler.erl index 2307b79db..06f4e23a6 100644 --- a/apps/emqx/src/emqx_alarm_handler.erl +++ b/apps/emqx/src/emqx_alarm_handler.erl @@ -21,7 +21,6 @@ -include("emqx.hrl"). -include("logger.hrl"). --logger_header("[Alarm Handler]"). %% gen_event callbacks -export([ init/1 diff --git a/apps/emqx/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl index 16804d329..f0991d967 100644 --- a/apps/emqx/src/emqx_banned.erl +++ b/apps/emqx/src/emqx_banned.erl @@ -22,7 +22,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Banned]"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_broker.erl b/apps/emqx/src/emqx_broker.erl index eb8023d34..1248f9980 100644 --- a/apps/emqx/src/emqx_broker.erl +++ b/apps/emqx/src/emqx_broker.erl @@ -23,7 +23,6 @@ -include("types.hrl"). -include("emqx_mqtt.hrl"). --logger_header("[Broker]"). -export([start_link/2]). diff --git a/apps/emqx/src/emqx_broker_helper.erl b/apps/emqx/src/emqx_broker_helper.erl index 705715c6c..fad4e8713 100644 --- a/apps/emqx/src/emqx_broker_helper.erl +++ b/apps/emqx/src/emqx_broker_helper.erl @@ -21,7 +21,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Broker Helper]"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl index 21e2a516c..5e4d11953 100644 --- a/apps/emqx/src/emqx_channel.erl +++ b/apps/emqx/src/emqx_channel.erl @@ -22,7 +22,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Channel]"). -ifdef(TEST). -compile(export_all). diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl index e2c8438a2..f4f5f3981 100644 --- a/apps/emqx/src/emqx_cm.erl +++ b/apps/emqx/src/emqx_cm.erl @@ -24,7 +24,6 @@ -include("types.hrl"). -include_lib("snabbkaffe/include/snabbkaffe.hrl"). --logger_header("[CM]"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl index da716ca29..c04f6ccaf 100644 --- a/apps/emqx/src/emqx_cm_registry.erl +++ b/apps/emqx/src/emqx_cm_registry.erl @@ -23,7 +23,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Registry]"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_connection.erl b/apps/emqx/src/emqx_connection.erl index 21ba5231e..ac66c4daf 100644 --- a/apps/emqx/src/emqx_connection.erl +++ b/apps/emqx/src/emqx_connection.erl @@ -23,7 +23,6 @@ -include("types.hrl"). -include_lib("snabbkaffe/include/snabbkaffe.hrl"). --logger_header("[MQTT]"). -ifdef(TEST). -compile(export_all). diff --git a/apps/emqx/src/emqx_ctl.erl b/apps/emqx/src/emqx_ctl.erl index 84aa54de6..051d4de6f 100644 --- a/apps/emqx/src/emqx_ctl.erl +++ b/apps/emqx/src/emqx_ctl.erl @@ -21,7 +21,6 @@ -include("types.hrl"). -include("logger.hrl"). --logger_header("[Ctl]"). -export([start_link/0, stop/0]). diff --git a/apps/emqx/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl index 0b852d88d..c4a523669 100644 --- a/apps/emqx/src/emqx_flapping.erl +++ b/apps/emqx/src/emqx_flapping.erl @@ -22,8 +22,6 @@ -include("types.hrl"). -include("logger.hrl"). --logger_header("[Flapping]"). - -export([start_link/0, stop/0]). %% API @@ -162,4 +160,4 @@ start_timer(Zone) -> start_timers() -> lists:foreach(fun({Zone, _ZoneConf}) -> start_timer(Zone) - end, maps:to_list(emqx_config:get([zones], #{}))). \ No newline at end of file + end, maps:to_list(emqx_config:get([zones], #{}))). diff --git a/apps/emqx/src/emqx_hooks.erl b/apps/emqx/src/emqx_hooks.erl index eb2da4276..088bb4085 100644 --- a/apps/emqx/src/emqx_hooks.erl +++ b/apps/emqx/src/emqx_hooks.erl @@ -22,7 +22,6 @@ -include("types.hrl"). -include_lib("stdlib/include/ms_transform.hrl"). --logger_header("[Hooks]"). -export([ start_link/0 , stop/0 diff --git a/apps/emqx/src/emqx_metrics.erl b/apps/emqx/src/emqx_metrics.erl index cd0039791..736bb05b0 100644 --- a/apps/emqx/src/emqx_metrics.erl +++ b/apps/emqx/src/emqx_metrics.erl @@ -24,7 +24,6 @@ -include("emqx_mqtt.hrl"). -include("emqx.hrl"). --logger_header("[Metrics]"). -export([ start_link/0 , stop/0 diff --git a/apps/emqx/src/emqx_os_mon.erl b/apps/emqx/src/emqx_os_mon.erl index fdcdf82b3..9fd52c21b 100644 --- a/apps/emqx/src/emqx_os_mon.erl +++ b/apps/emqx/src/emqx_os_mon.erl @@ -20,7 +20,6 @@ -include("logger.hrl"). --logger_header("[OS_MON]"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_plugins.erl b/apps/emqx/src/emqx_plugins.erl index 3c91e612f..6c99305d4 100644 --- a/apps/emqx/src/emqx_plugins.erl +++ b/apps/emqx/src/emqx_plugins.erl @@ -19,7 +19,6 @@ -include("emqx.hrl"). -include("logger.hrl"). --logger_header("[Plugins]"). -export([ load/0 , load/1 diff --git a/apps/emqx/src/emqx_pool.erl b/apps/emqx/src/emqx_pool.erl index 0a336264d..8fa950fe3 100644 --- a/apps/emqx/src/emqx_pool.erl +++ b/apps/emqx/src/emqx_pool.erl @@ -21,7 +21,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Pool]"). %% APIs -export([start_link/2]). diff --git a/apps/emqx/src/emqx_psk.erl b/apps/emqx/src/emqx_psk.erl index f8be93056..0c5ca2964 100644 --- a/apps/emqx/src/emqx_psk.erl +++ b/apps/emqx/src/emqx_psk.erl @@ -18,7 +18,6 @@ -include("logger.hrl"). --logger_header("[PSK]"). %% SSL PSK Callbacks -export([lookup/3]). diff --git a/apps/emqx/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl index 02ac29cbc..1a5e344f2 100644 --- a/apps/emqx/src/emqx_router.erl +++ b/apps/emqx/src/emqx_router.erl @@ -23,7 +23,6 @@ -include("types.hrl"). -include_lib("ekka/include/ekka.hrl"). --logger_header("[Router]"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_router_helper.erl b/apps/emqx/src/emqx_router_helper.erl index 8761a250e..5866e86b3 100644 --- a/apps/emqx/src/emqx_router_helper.erl +++ b/apps/emqx/src/emqx_router_helper.erl @@ -22,7 +22,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Router Helper]"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_session.erl b/apps/emqx/src/emqx_session.erl index 3e0f56610..f915155cb 100644 --- a/apps/emqx/src/emqx_session.erl +++ b/apps/emqx/src/emqx_session.erl @@ -48,7 +48,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Session]"). -ifdef(TEST). -compile(export_all). diff --git a/apps/emqx/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl index 65c0e4d8d..1968c47d8 100644 --- a/apps/emqx/src/emqx_shared_sub.erl +++ b/apps/emqx/src/emqx_shared_sub.erl @@ -23,7 +23,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Shared Sub]"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl index f53549e65..51ba72155 100644 --- a/apps/emqx/src/emqx_stats.erl +++ b/apps/emqx/src/emqx_stats.erl @@ -22,7 +22,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[Stats]"). %% APIs -export([ start_link/0 diff --git a/apps/emqx/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl index 2f3f782e6..e15e7489e 100644 --- a/apps/emqx/src/emqx_sys.erl +++ b/apps/emqx/src/emqx_sys.erl @@ -22,7 +22,6 @@ -include("types.hrl"). -include("logger.hrl"). --logger_header("[SYS]"). -export([ start_link/0 , stop/0 diff --git a/apps/emqx/src/emqx_sys_mon.erl b/apps/emqx/src/emqx_sys_mon.erl index 54a5c533a..0b981ffec 100644 --- a/apps/emqx/src/emqx_sys_mon.erl +++ b/apps/emqx/src/emqx_sys_mon.erl @@ -21,7 +21,6 @@ -include("types.hrl"). -include("logger.hrl"). --logger_header("[SYSMON]"). -export([start_link/0]). diff --git a/apps/emqx/src/emqx_tracer.erl b/apps/emqx/src/emqx_tracer.erl index 995712f6c..d05840433 100644 --- a/apps/emqx/src/emqx_tracer.erl +++ b/apps/emqx/src/emqx_tracer.erl @@ -19,7 +19,6 @@ -include("emqx.hrl"). -include("logger.hrl"). --logger_header("[Tracer]"). %% APIs -export([ trace/2 diff --git a/apps/emqx/src/emqx_ws_connection.erl b/apps/emqx/src/emqx_ws_connection.erl index 540076eaf..b76567f6c 100644 --- a/apps/emqx/src/emqx_ws_connection.erl +++ b/apps/emqx/src/emqx_ws_connection.erl @@ -22,7 +22,6 @@ -include("logger.hrl"). -include("types.hrl"). --logger_header("[MQTT/WS]"). -ifdef(TEST). -compile(export_all). diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl index 51600ea81..50c8e5122 100644 --- a/apps/emqx_authz/src/emqx_authz.erl +++ b/apps/emqx_authz/src/emqx_authz.erl @@ -20,7 +20,6 @@ -include("emqx_authz.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[AuthZ]"). -export([ register_metrics/0 , init/0 diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl index 0075b4a1d..ef4d076a4 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl @@ -20,7 +20,6 @@ -include("emqx_bridge_mqtt.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[Bridge]"). %% APIs -export([ start_link/0 diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl index dfef6973e..630fb4443 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl @@ -116,7 +116,6 @@ -include_lib("emqx/include/logger.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl"). --logger_header("[Bridge]"). %% same as default in-flight limit for emqtt -define(DEFAULT_BATCH_SIZE, 32). diff --git a/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl b/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl index 7349ec310..1f5cff043 100644 --- a/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl +++ b/apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl @@ -20,7 +20,6 @@ -include_lib("emqx/include/types.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[PGW-Conn]"). %% API -export([ start_link/3 diff --git a/apps/emqx_gateway/src/coap/resources/emqx_coap_mqtt_resource.erl b/apps/emqx_gateway/src/coap/resources/emqx_coap_mqtt_resource.erl index f52610492..1fd3d7b8e 100644 --- a/apps/emqx_gateway/src/coap/resources/emqx_coap_mqtt_resource.erl +++ b/apps/emqx_gateway/src/coap/resources/emqx_coap_mqtt_resource.erl @@ -22,7 +22,6 @@ -include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("emqx_gateway/src/coap/include/emqx_coap.hrl"). --logger_header("[CoAP-RES]"). -export([ init/1 , stop/1 diff --git a/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_resource.erl b/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_resource.erl index c7c13da0c..c750f66dd 100644 --- a/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_resource.erl +++ b/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_resource.erl @@ -22,7 +22,6 @@ -include_lib("emqx/include/logger.hrl"). -include_lib("emqx_gateway/src/coap/include/emqx_coap.hrl"). --logger_header("[CoAP-PS-RES]"). -export([ init/1 , stop/1 diff --git a/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_topics.erl b/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_topics.erl index 4ebada566..a0fa15467 100644 --- a/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_topics.erl +++ b/apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_topics.erl @@ -21,7 +21,6 @@ -include_lib("emqx/include/logger.hrl"). -include_lib("emqx_gateway/src/coap/include/emqx_coap.hrl"). --logger_header("[CoAP-PS-TOPICS]"). -export([ start_link/0 , stop/1 diff --git a/apps/emqx_gateway/src/emqx_gateway_app.erl b/apps/emqx_gateway/src/emqx_gateway_app.erl index a25640c9b..582a3d26a 100644 --- a/apps/emqx_gateway/src/emqx_gateway_app.erl +++ b/apps/emqx_gateway/src/emqx_gateway_app.erl @@ -20,7 +20,6 @@ -include_lib("emqx/include/logger.hrl"). --logger_header("[Gateway]"). -export([start/2, stop/1]). diff --git a/apps/emqx_gateway/src/emqx_gateway_cm.erl b/apps/emqx_gateway/src/emqx_gateway_cm.erl index e4d21e1a5..546640a90 100644 --- a/apps/emqx_gateway/src/emqx_gateway_cm.erl +++ b/apps/emqx_gateway/src/emqx_gateway_cm.erl @@ -26,7 +26,6 @@ -include("include/emqx_gateway.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[PGW-CM]"). %% APIs -export([start_link/1]). diff --git a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl index 4275fdf3e..2c449828e 100644 --- a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl +++ b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl @@ -19,7 +19,6 @@ -behaviour(gen_server). --logger_header("[PGW-CM-Registy]"). -export([start_link/1]). diff --git a/apps/emqx_gateway/src/emqx_gateway_ctx.erl b/apps/emqx_gateway/src/emqx_gateway_ctx.erl index 722d4e549..69baf7593 100644 --- a/apps/emqx_gateway/src/emqx_gateway_ctx.erl +++ b/apps/emqx_gateway/src/emqx_gateway_ctx.erl @@ -19,7 +19,6 @@ -include("include/emqx_gateway.hrl"). --logger_header(["PGW-Ctx"]). %% @doc The running context for a Connection/Channel process. %% diff --git a/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl b/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl index 7994a6cea..0a3cef556 100644 --- a/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl +++ b/apps/emqx_gateway/src/emqx_gateway_insta_sup.erl @@ -21,7 +21,6 @@ -include("include/emqx_gateway.hrl"). --logger_header("[PGW-Insta-Sup]"). %% APIs -export([ start_link/3 diff --git a/apps/emqx_gateway/src/emqx_gateway_metrics.erl b/apps/emqx_gateway/src/emqx_gateway_metrics.erl index 461eb3344..d4e39443c 100644 --- a/apps/emqx_gateway/src/emqx_gateway_metrics.erl +++ b/apps/emqx_gateway/src/emqx_gateway_metrics.erl @@ -20,7 +20,6 @@ -include("include/emqx_gateway.hrl"). --logger_header("[PGW-Metrics]"). %% APIs -export([start_link/1]). diff --git a/apps/emqx_gateway/src/emqx_gateway_registry.erl b/apps/emqx_gateway/src/emqx_gateway_registry.erl index dde440756..07cc37bd8 100644 --- a/apps/emqx_gateway/src/emqx_gateway_registry.erl +++ b/apps/emqx_gateway/src/emqx_gateway_registry.erl @@ -19,7 +19,6 @@ -include("include/emqx_gateway.hrl"). --logger_header("[PGW-Registry]"). -behavior(gen_server). diff --git a/apps/emqx_gateway/src/exhook/emqx_exhook.erl b/apps/emqx_gateway/src/exhook/emqx_exhook.erl index b3b3057b6..3d977d2f1 100644 --- a/apps/emqx_gateway/src/exhook/emqx_exhook.erl +++ b/apps/emqx_gateway/src/exhook/emqx_exhook.erl @@ -19,7 +19,6 @@ -include("src/exhook/include/emqx_exhook.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[ExHook]"). %% Mgmt APIs -export([ enable/2 diff --git a/apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl b/apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl index 9033fdacc..2bb2dc7f5 100644 --- a/apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl +++ b/apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl @@ -20,7 +20,6 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[ExHook]"). -export([ on_client_connect/2 , on_client_connack/3 diff --git a/apps/emqx_gateway/src/exhook/emqx_exhook_server.erl b/apps/emqx_gateway/src/exhook/emqx_exhook_server.erl index 79bc52b4e..79bb9d32b 100644 --- a/apps/emqx_gateway/src/exhook/emqx_exhook_server.erl +++ b/apps/emqx_gateway/src/exhook/emqx_exhook_server.erl @@ -19,7 +19,6 @@ -include("src/exhook/include/emqx_exhook.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[ExHook Svr]"). -define(CNTER, emqx_exhook_counter). -define(PB_CLIENT_MOD, emqx_exhook_v_1_hook_provider_client). diff --git a/apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl b/apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl index 5301de4e4..38fa27162 100644 --- a/apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl +++ b/apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl @@ -21,7 +21,6 @@ -include_lib("emqx/include/types.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[ExProto Channel]"). -export([ info/1 , info/2 diff --git a/apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl b/apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl index 34f0606ef..f30e2b6f7 100644 --- a/apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl +++ b/apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl @@ -21,7 +21,6 @@ -include_lib("emqx/include/logger.hrl"). --logger_header("[ExProto gClient]"). %% APIs -export([async_call/3]). diff --git a/apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl b/apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl index f09a9df7b..346f87452 100644 --- a/apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl +++ b/apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl @@ -22,7 +22,6 @@ -include("src/exproto/include/emqx_exproto.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[ExProto gServer]"). -define(IS_QOS(X), (X =:= 0 orelse X =:= 1 orelse X =:= 2)). diff --git a/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl b/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl index d7717fdc4..980fea74f 100644 --- a/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl +++ b/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl @@ -23,7 +23,6 @@ -include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[SN-Proto]"). %% API -export([ info/1 diff --git a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl index ef6e21e66..fa7b2a357 100644 --- a/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl +++ b/apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl @@ -22,7 +22,6 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[Stomp-Proto]"). -import(proplists, [get_value/2, get_value/3]). diff --git a/apps/emqx_modules/src/emqx_delayed.erl b/apps/emqx_modules/src/emqx_delayed.erl index 2e0706cbd..c55a8ddab 100644 --- a/apps/emqx_modules/src/emqx_delayed.erl +++ b/apps/emqx_modules/src/emqx_delayed.erl @@ -21,7 +21,6 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[Delayed]"). %% Mnesia bootstrap -export([mnesia/1]). diff --git a/apps/emqx_modules/src/emqx_topic_metrics.erl b/apps/emqx_modules/src/emqx_topic_metrics.erl index 7297878fe..5e6a3bc98 100644 --- a/apps/emqx_modules/src/emqx_topic_metrics.erl +++ b/apps/emqx_modules/src/emqx_topic_metrics.erl @@ -22,7 +22,6 @@ -include_lib("emqx/include/logger.hrl"). -include_lib("emqx/include/emqx_mqtt.hrl"). --logger_header("[TOPIC_METRICS]"). -export([ on_message_publish/1 , on_message_delivered/2 diff --git a/apps/emqx_retainer/src/emqx_retainer.erl b/apps/emqx_retainer/src/emqx_retainer.erl index 524078153..86cf98af6 100644 --- a/apps/emqx_retainer/src/emqx_retainer.erl +++ b/apps/emqx_retainer/src/emqx_retainer.erl @@ -22,7 +22,6 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[Retainer]"). -export([start_link/0]). diff --git a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl index 5b6028980..dcfeffa8c 100644 --- a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl +++ b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl @@ -23,7 +23,6 @@ -include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/qlc.hrl"). --logger_header("[Retainer]"). -export([delete_message/2 , store_retained/2 diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl index 24b4d2c13..122ae7705 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl @@ -19,7 +19,6 @@ -include("rule_engine.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[RuleEngineAPI]"). -rest_api(#{name => create_rule, method => 'POST', diff --git a/apps/emqx_rule_engine/src/emqx_rule_events.erl b/apps/emqx_rule_engine/src/emqx_rule_events.erl index 5865f224c..6eacced42 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_events.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_events.erl @@ -20,7 +20,6 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[RuleEvents]"). -export([ load/1 , unload/0 diff --git a/apps/emqx_rule_engine/src/emqx_rule_monitor.erl b/apps/emqx_rule_engine/src/emqx_rule_monitor.erl index ed3b23395..dd2f6237c 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_monitor.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_monitor.erl @@ -20,7 +20,6 @@ -include("rule_engine.hrl"). -include_lib("emqx/include/logger.hrl"). --logger_header("[Rule Monitor]"). -export([init/1, handle_call/3,