From 56195670c61fa9035404e381296c342d9144e536 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 12 Jan 2018 10:45:36 +0800 Subject: [PATCH 1/2] Misc fix --- src/emqttd_session.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl index aa1a027a4..841a645a3 100644 --- a/src/emqttd_session.erl +++ b/src/emqttd_session.erl @@ -286,8 +286,8 @@ init([CleanSess, {ClientId, Username}, ClientPid]) -> {ok, QEnv} = emqttd:env(mqueue), MaxInflight = get_value(max_inflight, Env, 0), EnableStats = get_value(enable_stats, Env, false), - IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false), ForceGcCount = emqttd_gc:conn_max_gc_count(), + IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false), MQueue = ?MQueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()), State = #state{clean_sess = CleanSess, binding = binding(ClientPid), From a1cbdc51228ab9d7933932ccae8d847cfaf6ac4b Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 12 Jan 2018 10:46:35 +0800 Subject: [PATCH 2/2] Update emq.conf and emq.schema --- etc/emq.conf | 8 ++++---- priv/emq.schema | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/etc/emq.conf b/etc/emq.conf index b8c21dc40..ef05b70e2 100644 --- a/etc/emq.conf +++ b/etc/emq.conf @@ -1105,7 +1105,7 @@ listener.ws.external.send_timeout_close = on ## The TCP send buffer(os kernel) for external MQTT/Websocket connections. ## -## See 'listener.tcp..sndbuf' +## See: listener.tcp..sndbuf ## ## Value: Bytes ## listener.ws.external.sndbuf = 4KB @@ -1159,7 +1159,7 @@ listener.wss.external.max_clients = 64 ## Mountpoint of the MQTT/Websocket/SSL Listener. ## -## See 'listener.tcp..mountpoint' +## See: listener.tcp..mountpoint ## ## Value: String ## listener.wss.external.mountpoint = inbound/ @@ -1262,14 +1262,14 @@ listener.wss.external.certfile = {{ platform_etc_dir }}/certs/cert.pem ## TCP backlog for the Websocket/SSL connection. ## -## See 'listener.tcp..backlog' +## See listener.tcp..backlog ## ## Value: Number >= 0 listener.wss.external.backlog = 1024 ## The TCP send timeout for the Websocket/SSL connection. ## -## See 'listener.tcp..send_timeout' +## See: listener.tcp..send_timeout ## ## Value: Duration listener.wss.external.send_timeout = 15s diff --git a/priv/emq.schema b/priv/emq.schema index 11c45cecb..a70a90f90 100644 --- a/priv/emq.schema +++ b/priv/emq.schema @@ -400,7 +400,7 @@ end}. {translation, "lager.handlers", fun(Conf) -> - ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf) of + ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf, undefined) of undefined -> []; ErrorFilename -> [{lager_file_backend, [{file, ErrorFilename}, {level, error}, @@ -442,7 +442,6 @@ end}. cuttlefish:conf_get("log.syslog.facility", Conf), cuttlefish:conf_get("log.syslog.level", Conf)]}] end, - ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler end }.