yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Feng Lee 2018-01-12 10:47:36 +08:00
parent 6ad7b46885 a1cbdc5122
commit 43712ea803
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/emq.conf
View File

@ -1105,7 +1105,7 @@ listener.ws.external.send_timeout_close = on
## The TCP send buffer(os kernel) for external MQTT/Websocket connections. ## The TCP send buffer(os kernel) for external MQTT/Websocket connections.
## ##
## See 'listener.tcp.<name>.sndbuf' ## See: listener.tcp.<name>.sndbuf
## ##
## Value: Bytes ## Value: Bytes
## listener.ws.external.sndbuf = 4KB ## listener.ws.external.sndbuf = 4KB
@ -1159,7 +1159,7 @@ listener.wss.external.max_clients = 64
## Mountpoint of the MQTT/Websocket/SSL Listener. ## Mountpoint of the MQTT/Websocket/SSL Listener.
## ##
## See 'listener.tcp.<name>.mountpoint' ## See: listener.tcp.<name>.mountpoint
## ##
## Value: String ## Value: String
## listener.wss.external.mountpoint = inbound/ ## 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. ## TCP backlog for the Websocket/SSL connection.
## ##
## See 'listener.tcp.<name>.backlog' ## See listener.tcp.<name>.backlog
## ##
## Value: Number >= 0 ## Value: Number >= 0
listener.wss.external.backlog = 1024 listener.wss.external.backlog = 1024
## The TCP send timeout for the Websocket/SSL connection. ## The TCP send timeout for the Websocket/SSL connection.
## ##
## See 'listener.tcp.<name>.send_timeout' ## See: listener.tcp.<name>.send_timeout
## ##
## Value: Duration ## Value: Duration
listener.wss.external.send_timeout = 15s listener.wss.external.send_timeout = 15s

3
priv/emq.schema
View File

@ -400,7 +400,7 @@ end}.
{translation, {translation,
"lager.handlers", "lager.handlers",
fun(Conf) -> fun(Conf) ->
ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf) of ErrorHandler = case cuttlefish:conf_get("log.error.file", Conf, undefined) of
undefined -> []; undefined -> [];
ErrorFilename -> [{lager_file_backend, [{file, ErrorFilename}, ErrorFilename -> [{lager_file_backend, [{file, ErrorFilename},
{level, error}, {level, error},
@ -442,7 +442,6 @@ end}.
cuttlefish:conf_get("log.syslog.facility", Conf), cuttlefish:conf_get("log.syslog.facility", Conf),
cuttlefish:conf_get("log.syslog.level", Conf)]}] cuttlefish:conf_get("log.syslog.level", Conf)]}]
end, end,
ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler
end end
}. }.

2
src/emqttd_session.erl
View File

@ -286,8 +286,8 @@ init([CleanSess, {ClientId, Username}, ClientPid]) ->
{ok, QEnv} = emqttd:env(mqueue), {ok, QEnv} = emqttd:env(mqueue),
MaxInflight = get_value(max_inflight, Env, 0), MaxInflight = get_value(max_inflight, Env, 0),
EnableStats = get_value(enable_stats, Env, false), EnableStats = get_value(enable_stats, Env, false),
IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false),
ForceGcCount = emqttd_gc:conn_max_gc_count(), ForceGcCount = emqttd_gc:conn_max_gc_count(),
IgnoreLoopDeliver = get_value(ignore_loop_deliver, Env, false),
MQueue = ?MQueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()), MQueue = ?MQueue:new(ClientId, QEnv, emqttd_alarm:alarm_fun()),
State = #state{clean_sess = CleanSess, State = #state{clean_sess = CleanSess,
binding = binding(ClientPid), binding = binding(ClientPid),