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

handshake_timeout change

This commit is contained in:
turtled 2016-11-03 11:04:57 +08:00
parent 3a0f4044e5
commit 3db876781b
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/emq.conf
View File

@ -206,7 +206,7 @@ mqtt.listener.ssl.max_clients = 512
## Configuring SSL Options ## Configuring SSL Options
## See http://erlang.org/doc/man/ssl.html ## See http://erlang.org/doc/man/ssl.html
mqtt.listener.ssl.handshake_timeout = 2000 mqtt.listener.ssl.handshake_timeout = 15
mqtt.listener.ssl.keyfile = etc/certs/key.pem mqtt.listener.ssl.keyfile = etc/certs/key.pem
mqtt.listener.ssl.certfile = etc/certs/cert.pem mqtt.listener.ssl.certfile = etc/certs/cert.pem
## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
@ -222,7 +222,7 @@ mqtt.listener.http.max_clients = 64
## mqtt.listener.https = 8084 ## mqtt.listener.https = 8084
## mqtt.listener.https.acceptors = 4 ## mqtt.listener.https.acceptors = 4
## mqtt.listener.https.max_clients = 64 ## mqtt.listener.https.max_clients = 64
## mqtt.listener.https.handshake_timeout = 10 ## mqtt.listener.https.handshake_timeout = 15
## mqtt.listener.https.certfile = etc/certs/cert.pem ## mqtt.listener.https.certfile = etc/certs/cert.pem
## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.keyfile = etc/certs/key.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem

2
priv/emq.schema
View File

@ -611,7 +611,7 @@ end}.
{nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}]) {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}])
end, end,
SslOpts = fun(Prefix) -> SslOpts = fun(Prefix) ->
Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf)}, Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000},
{keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)},
{certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
{cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},

2
src/emqttd_http.erl
View File

@ -137,6 +137,8 @@ authorized(Req) ->
case emqttd_access_control:auth(#mqtt_client{username = Username, peername = Peer}, Password) of case emqttd_access_control:auth(#mqtt_client{username = Username, peername = Peer}, Password) of
ok -> ok ->
true; true;
{ok, _IsSuper} ->
true;
{error, Reason} -> {error, Reason} ->
lager:error("HTTP Auth failure: username=~s, reason=~p", [Username, Reason]), lager:error("HTTP Auth failure: username=~s, reason=~p", [Username, Reason]),
false false

4
test/emqttd_SUITE_data/emqttd.conf
View File

@ -206,7 +206,7 @@ mqtt.listener.ssl.max_clients = 512
## Configuring SSL Options ## Configuring SSL Options
## See http://erlang.org/doc/man/ssl.html ## See http://erlang.org/doc/man/ssl.html
mqtt.listener.ssl.handshake_timeout = 2000 mqtt.listener.ssl.handshake_timeout = 15
mqtt.listener.ssl.keyfile = etc/certs/key.pem mqtt.listener.ssl.keyfile = etc/certs/key.pem
mqtt.listener.ssl.certfile = etc/certs/cert.pem mqtt.listener.ssl.certfile = etc/certs/cert.pem
## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem ## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
@ -222,7 +222,7 @@ mqtt.listener.http.max_clients = 64
## mqtt.listener.https = 8084 ## mqtt.listener.https = 8084
## mqtt.listener.https.acceptors = 4 ## mqtt.listener.https.acceptors = 4
## mqtt.listener.https.max_clients = 64 ## mqtt.listener.https.max_clients = 64
## mqtt.listener.https.handshake_timeout = 10 ## mqtt.listener.https.handshake_timeout = 15
## mqtt.listener.https.certfile = etc/certs/cert.pem ## mqtt.listener.https.certfile = etc/certs/cert.pem
## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.keyfile = etc/certs/key.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem

2
test/emqttd_SUITE_data/emqttd.schema
View File

@ -611,7 +611,7 @@ end}.
{nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}]) {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}])
end, end,
SslOpts = fun(Prefix) -> SslOpts = fun(Prefix) ->
Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf)}, Filter([{handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf) * 1000},
{keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)},
{certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)},
{cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)},