Add more macros for logger

include/logger.hrl

@@ -1,10 +1,42 @@
-%%--------------------------------------------------------------------
+%% Copyright (c) 2018 EMQ Technologies Co., Ltd. All Rights Reserved.
-%% The args are put into report_cb for lazy evaluation.
+%%
-%%--------------------------------------------------------------------
+%% Licensed under the Apache License, Version 2.0 (the "License");
--define(LOG_LZ(Level, Format, Args),
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+
+%% debug | info | notice | warning | error | critical | alert | emergency
+
+-define(DEBUG(Format), ?LOG(debug, Format, [])).
+-define(DEBUG(Format, Args), ?LOG(debug, Format, Args)).
+
+-define(INFO(Format), ?LOG(info, Format, [])).
+-define(INFO(Format, Args), ?LOG(info, Format, Args)).
+
+-define(NOTICE(Format), ?LOG(notice, Format, [])).
+-define(NOTICE(Format, Args), ?LOG(notice, Format, Args)).
+
+-define(WARN(Format), ?LOG(warning, Format, [])).
+-define(WARN(Format, Args), ?LOG(warning, Format, [])).
+
+-define(ERROR(Format), ?LOG(error, Format, [])).
+-define(ERROR(Format, Args), ?LOG(error, Format, Args)).
+
+-define(CRITICAL(Format), ?LOG(critical, Format, [])).
+-define(CRITICAL(Format, Args), ?LOG(critical, Format, Args)).
+
+-define(ALERT(Format), ?LOG(alert, Format, [])).
+-define(ALERT(Format, Args), ?LOG(alert, Format, Args)).
+
+-define(LOG(Level, Format, Args),
         begin
-          (logger:log(Level,#{},#{report_cb =>
+          (logger:log(Level,#{},#{report_cb => fun(_) -> {(Format), (Args)} end}))
-                                    fun(_) ->
+        end).
-                                        {(Format), (Args)}
+
-                                    end}))
-        end).

src/emqx_connection.erl

@@ -18,7 +18,6 @@
 
 -include("emqx.hrl").
 -include("emqx_mqtt.hrl").
-
 -include("logger.hrl").
 
 -export([start_link/3]).
@@ -52,8 +51,6 @@
 -define(DEFAULT_ACTIVE_N, 100).
 -define(SOCK_STATS, [recv_oct, recv_cnt, send_oct, send_cnt, send_pend]).
 
--define(LOG(Level, Format, Args), ?LOG_LZ(Level, "[MQTT] " ++ Format, Args)).
-
 start_link(Transport, Socket, Options) ->
     {ok, proc_lib:spawn_link(?MODULE, init, [[Transport, Socket, Options]])}.
 

src/emqx_protocol.erl

@@ -77,8 +77,6 @@
 
 -define(NO_PROPS, undefined).
 
--define(LOG(Level, Format, Args), ?LOG_LZ(Level, "[MQTT] " ++ Format, Args)).
-
 %%------------------------------------------------------------------------------
 %% Init
 %%------------------------------------------------------------------------------

src/emqx_session.erl

@@ -42,7 +42,6 @@
 
 -include("emqx.hrl").
 -include("emqx_mqtt.hrl").
-
 -include("logger.hrl").
 
 -export([start_link/1]).
@@ -157,8 +156,6 @@
 
 -export_type([attr/0]).
 
--define(LOG(Level, Format, Args), ?LOG_LZ(Level, "[Session] " ++ Format, Args)).
-
 %% @doc Start a session proc.
 -spec(start_link(SessAttrs :: map()) -> {ok, pid()}).
 start_link(SessAttrs) ->

src/emqx_ws_connection.erl

@@ -46,8 +46,6 @@
 
 -define(SOCK_STATS, [recv_oct, recv_cnt, send_oct, send_cnt]).
 
--define(LOG(Level, Format, Args), ?LOG_LZ(Level, "[MQTT-WS] " ++ Format, Args)).
-
 %%------------------------------------------------------------------------------
 %% API
 %%------------------------------------------------------------------------------