Add send_timeout, send_timeout_close options

This commit is contained in:
Feng Lee 2017-12-05 19:47:17 +08:00
parent b8e0a4d5c4
commit 8e41aeeeb8
2 changed files with 90 additions and 2 deletions

View File

@ -343,6 +343,10 @@ listener.tcp.external.access.2 = allow all
## TCP Socket Options
listener.tcp.external.backlog = 1024
listener.tcp.external.send_timeout = 15s
listener.tcp.external.send_timeout_close = on
#listener.tcp.external.recbuf = 4KB
#listener.tcp.external.sndbuf = 4KB
@ -371,6 +375,10 @@ listener.tcp.internal.max_clients = 102400
## TCP Socket Options
listener.tcp.internal.backlog = 512
listener.tcp.internal.send_timeout = 15s
listener.tcp.external.send_timeout_close = on
listener.tcp.internal.tune_buffer = on
listener.tcp.internal.buffer = 1MB
@ -477,6 +485,10 @@ listener.ssl.external.certfile = {{ platform_etc_dir }}/certs/cert.pem
## SSL Socket Options
## listener.ssl.external.backlog = 1024
## listener.ssl.external.send_timeout = 15s
## listener.ssl.external.send_timeout_close = on
## listener.ssl.external.recbuf = 4KB
## listener.ssl.external.sndbuf = 4KB
@ -499,6 +511,10 @@ listener.ws.external.access.1 = allow all
## TCP Options
listener.ws.external.backlog = 1024
listener.ws.external.send_timeout = 15s
listener.ws.external.send_timeout_close = on
listener.ws.external.recbuf = 4KB
listener.ws.external.sndbuf = 4KB
@ -531,6 +547,20 @@ listener.wss.external.certfile = {{ platform_etc_dir }}/certs/cert.pem
## listener.wss.external.fail_if_no_peer_cert = true
listener.wss.external.backlog = 1024
listener.wss.external.send_timeout = 15s
listener.wss.external.send_timeout_close = on
## listener.wss.external.recbuf = 4KB
## listener.wss.external.sndbuf = 4KB
## listener.wss.external.buffer = 4KB
## listener.wss.external.nodelay = true
##--------------------------------------------------------------------
## HTTP Management API Listener
@ -542,6 +572,12 @@ listener.api.mgmt.max_clients = 64
listener.api.mgmt.access.1 = allow all
listener.api.mgmt.backlog = 512
listener.api.mgmt.send_timeout = 15s
listener.api.mgmt.send_timeout_close = on
##-------------------------------------------------------------------
## System Monitor
##-------------------------------------------------------------------

View File

@ -805,8 +805,18 @@ end}.
]}.
{mapping, "listener.tcp.$name.backlog", "emqttd.listeners", [
{default, 1024},
{datatype, integer}
{datatype, integer},
{default, 1024}
]}.
{mapping, "listener.tcp.$name.send_timeout", "emqttd.listeners", [
{datatype, {duration, ms}},
{default, "15s"}
]}.
{mapping, "listener.tcp.$name.send_timeout_close", "emqttd.listeners", [
{datatype, flag},
{default, on}
]}.
{mapping, "listener.tcp.$name.recbuf", "emqttd.listeners", [
@ -883,6 +893,16 @@ end}.
{datatype, integer}
]}.
{mapping, "listener.ssl.$name.send_timeout", "emqttd.listeners", [
{datatype, {duration, ms}},
{default, "15s"}
]}.
{mapping, "listener.ssl.$name.send_timeout_close", "emqttd.listeners", [
{datatype, flag},
{default, on}
]}.
{mapping, "listener.ssl.$name.recbuf", "emqttd.listeners", [
{datatype, bytesize},
hidden
@ -996,6 +1016,16 @@ end}.
{datatype, integer}
]}.
{mapping, "listener.ws.$name.send_timeout", "emqttd.listeners", [
{datatype, {duration, ms}},
{default, "15s"}
]}.
{mapping, "listener.ws.$name.send_timeout_close", "emqttd.listeners", [
{datatype, flag},
{default, on}
]}.
{mapping, "listener.ws.$name.recbuf", "emqttd.listeners", [
{datatype, bytesize},
hidden
@ -1059,6 +1089,16 @@ end}.
{datatype, integer}
]}.
{mapping, "listener.wss.$name.send_timeout", "emqttd.listeners", [
{datatype, {duration, ms}},
{default, "15s"}
]}.
{mapping, "listener.wss.$name.send_timeout_close", "emqttd.listeners", [
{datatype, flag},
{default, on}
]}.
{mapping, "listener.wss.$name.recbuf", "emqttd.listeners", [
{datatype, bytesize},
hidden
@ -1145,6 +1185,8 @@ end}.
end,
TcpOpts = fun(Prefix) ->
Filter([{backlog, cuttlefish:conf_get(Prefix ++ ".backlog", Conf, undefined)},
{send_timeout, cuttlefish:conf_get(Prefix ++ ".send_timeout", Conf, undefined)},
{send_timeout_close, cuttlefish:conf_get(Prefix ++ ".send_timeout_close", Conf, undefined)},
{recbuf, cuttlefish:conf_get(Prefix ++ ".recbuf", Conf, undefined)},
{sndbuf, cuttlefish:conf_get(Prefix ++ ".sndbuf", Conf, undefined)},
{buffer, cuttlefish:conf_get(Prefix ++ ".buffer", Conf, undefined)},
@ -1252,6 +1294,16 @@ end}.
{datatype, integer}
]}.
{mapping, "listener.api.$name.send_timeout", "emqttd.listeners", [
{datatype, {duration, ms}},
{default, "15s"}
]}.
{mapping, "listener.api.$name.send_timeout_close", "emqttd.listeners", [
{datatype, flag},
{default, on}
]}.
{mapping, "listener.api.$name.recbuf", "emqttd.listeners", [
{datatype, bytesize},
hidden