Browse Source

refactor(logging): delete log headers from all modules

Zaiming Shi 4 years ago
parent
commit
5d59ac1f02
56 changed files with 1 additions and 59 deletions
  1. 0 1
      apps/emqx/src/emqx.erl
  2. 0 2
      apps/emqx/src/emqx_alarm.erl
  3. 0 1
      apps/emqx/src/emqx_alarm_handler.erl
  4. 0 1
      apps/emqx/src/emqx_banned.erl
  5. 0 1
      apps/emqx/src/emqx_broker.erl
  6. 0 1
      apps/emqx/src/emqx_broker_helper.erl
  7. 0 1
      apps/emqx/src/emqx_channel.erl
  8. 0 1
      apps/emqx/src/emqx_cm.erl
  9. 0 1
      apps/emqx/src/emqx_cm_registry.erl
  10. 0 1
      apps/emqx/src/emqx_connection.erl
  11. 0 1
      apps/emqx/src/emqx_ctl.erl
  12. 1 3
      apps/emqx/src/emqx_flapping.erl
  13. 0 1
      apps/emqx/src/emqx_hooks.erl
  14. 0 1
      apps/emqx/src/emqx_metrics.erl
  15. 0 1
      apps/emqx/src/emqx_os_mon.erl
  16. 0 1
      apps/emqx/src/emqx_plugins.erl
  17. 0 1
      apps/emqx/src/emqx_pool.erl
  18. 0 1
      apps/emqx/src/emqx_psk.erl
  19. 0 1
      apps/emqx/src/emqx_router.erl
  20. 0 1
      apps/emqx/src/emqx_router_helper.erl
  21. 0 1
      apps/emqx/src/emqx_session.erl
  22. 0 1
      apps/emqx/src/emqx_shared_sub.erl
  23. 0 1
      apps/emqx/src/emqx_stats.erl
  24. 0 1
      apps/emqx/src/emqx_sys.erl
  25. 0 1
      apps/emqx/src/emqx_sys_mon.erl
  26. 0 1
      apps/emqx/src/emqx_tracer.erl
  27. 0 1
      apps/emqx/src/emqx_ws_connection.erl
  28. 0 1
      apps/emqx_authz/src/emqx_authz.erl
  29. 0 1
      apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl
  30. 0 1
      apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl
  31. 0 1
      apps/emqx_gateway/src/bhvrs/emqx_gateway_conn.erl
  32. 0 1
      apps/emqx_gateway/src/coap/resources/emqx_coap_mqtt_resource.erl
  33. 0 1
      apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_resource.erl
  34. 0 1
      apps/emqx_gateway/src/coap/resources/emqx_coap_pubsub_topics.erl
  35. 0 1
      apps/emqx_gateway/src/emqx_gateway_app.erl
  36. 0 1
      apps/emqx_gateway/src/emqx_gateway_cm.erl
  37. 0 1
      apps/emqx_gateway/src/emqx_gateway_cm_registry.erl
  38. 0 1
      apps/emqx_gateway/src/emqx_gateway_ctx.erl
  39. 0 1
      apps/emqx_gateway/src/emqx_gateway_insta_sup.erl
  40. 0 1
      apps/emqx_gateway/src/emqx_gateway_metrics.erl
  41. 0 1
      apps/emqx_gateway/src/emqx_gateway_registry.erl
  42. 0 1
      apps/emqx_gateway/src/exhook/emqx_exhook.erl
  43. 0 1
      apps/emqx_gateway/src/exhook/emqx_exhook_handler.erl
  44. 0 1
      apps/emqx_gateway/src/exhook/emqx_exhook_server.erl
  45. 0 1
      apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl
  46. 0 1
      apps/emqx_gateway/src/exproto/emqx_exproto_gcli.erl
  47. 0 1
      apps/emqx_gateway/src/exproto/emqx_exproto_gsvr.erl
  48. 0 1
      apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl
  49. 0 1
      apps/emqx_gateway/src/stomp/emqx_stomp_channel.erl
  50. 0 1
      apps/emqx_modules/src/emqx_delayed.erl
  51. 0 1
      apps/emqx_modules/src/emqx_topic_metrics.erl
  52. 0 1
      apps/emqx_retainer/src/emqx_retainer.erl
  53. 0 1
      apps/emqx_retainer/src/emqx_retainer_mnesia.erl
  54. 0 1
      apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
  55. 0 1
      apps/emqx_rule_engine/src/emqx_rule_events.erl
  56. 0 1
      apps/emqx_rule_engine/src/emqx_rule_monitor.erl

+ 0 - 1
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

+ 0 - 2
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]).
 

+ 0 - 1
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

+ 0 - 1
apps/emqx/src/emqx_banned.erl

@@ -22,7 +22,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Banned]").
 
 %% Mnesia bootstrap
 -export([mnesia/1]).

+ 0 - 1
apps/emqx/src/emqx_broker.erl

@@ -23,7 +23,6 @@
 -include("types.hrl").
 -include("emqx_mqtt.hrl").
 
--logger_header("[Broker]").
 
 -export([start_link/2]).
 

+ 0 - 1
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]).
 

+ 0 - 1
apps/emqx/src/emqx_channel.erl

@@ -22,7 +22,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Channel]").
 
 -ifdef(TEST).
 -compile(export_all).

+ 0 - 1
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]).
 

+ 0 - 1
apps/emqx/src/emqx_cm_registry.erl

@@ -23,7 +23,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Registry]").
 
 -export([start_link/0]).
 

+ 0 - 1
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).

+ 0 - 1
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]).
 

+ 1 - 3
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], #{}))).
+        end, maps:to_list(emqx_config:get([zones], #{}))).

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
apps/emqx/src/emqx_os_mon.erl

@@ -20,7 +20,6 @@
 
 -include("logger.hrl").
 
--logger_header("[OS_MON]").
 
 -export([start_link/0]).
 

+ 0 - 1
apps/emqx/src/emqx_plugins.erl

@@ -19,7 +19,6 @@
 -include("emqx.hrl").
 -include("logger.hrl").
 
--logger_header("[Plugins]").
 
 -export([ load/0
         , load/1

+ 0 - 1
apps/emqx/src/emqx_pool.erl

@@ -21,7 +21,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Pool]").
 
 %% APIs
 -export([start_link/2]).

+ 0 - 1
apps/emqx/src/emqx_psk.erl

@@ -18,7 +18,6 @@
 
 -include("logger.hrl").
 
--logger_header("[PSK]").
 
 %% SSL PSK Callbacks
 -export([lookup/3]).

+ 0 - 1
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]).

+ 0 - 1
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]).

+ 0 - 1
apps/emqx/src/emqx_session.erl

@@ -48,7 +48,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Session]").
 
 -ifdef(TEST).
 -compile(export_all).

+ 0 - 1
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]).

+ 0 - 1
apps/emqx/src/emqx_stats.erl

@@ -22,7 +22,6 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[Stats]").
 
 %% APIs
 -export([ start_link/0

+ 0 - 1
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

+ 0 - 1
apps/emqx/src/emqx_sys_mon.erl

@@ -21,7 +21,6 @@
 -include("types.hrl").
 -include("logger.hrl").
 
--logger_header("[SYSMON]").
 
 -export([start_link/0]).
 

+ 0 - 1
apps/emqx/src/emqx_tracer.erl

@@ -19,7 +19,6 @@
 -include("emqx.hrl").
 -include("logger.hrl").
 
--logger_header("[Tracer]").
 
 %% APIs
 -export([ trace/2

+ 0 - 1
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).

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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).

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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]).
 

+ 0 - 1
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]).

+ 0 - 1
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]).
 

+ 0 - 1
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.
 %%

+ 0 - 1
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

+ 0 - 1
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]).

+ 0 - 1
apps/emqx_gateway/src/emqx_gateway_registry.erl

@@ -19,7 +19,6 @@
 
 -include("include/emqx_gateway.hrl").
 
--logger_header("[PGW-Registry]").
 
 -behavior(gen_server).
 

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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).

+ 0 - 1
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

+ 0 - 1
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]).

+ 0 - 1
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)).
 

+ 0 - 1
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

+ 0 - 1
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]).
 

+ 0 - 1
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]).

+ 0 - 1
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

+ 0 - 1
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]).
 

+ 0 - 1
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

+ 0 - 1
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',

+ 0 - 1
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

+ 0 - 1
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,