Software /
code /
prosody
Diff
net/server.lua @ 7099:8e64e7b82928
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Fri, 22 Jan 2016 15:03:02 +0100 |
parent | 6485:4224abbf0fdd |
parent | 7098:5286e79c6829 |
child | 7543:23a8a26e8912 |
line wrap: on
line diff
--- a/net/server.lua Fri Jan 22 13:22:50 2016 +0000 +++ b/net/server.lua Fri Jan 22 15:03:02 2016 +0100 @@ -28,24 +28,24 @@ defaults[k] = v; end function set_config(settings) - local event_settings = { - ACCEPT_DELAY = settings.event_accept_retry_interval; - ACCEPT_QUEUE = settings.tcp_backlog; - CLEAR_DELAY = settings.event_clear_interval; - CONNECT_TIMEOUT = settings.connect_timeout; - DEBUG = settings.debug; - HANDSHAKE_TIMEOUT = settings.ssl_handshake_timeout; - MAX_CONNECTIONS = settings.max_connections; - MAX_HANDSHAKE_ATTEMPTS = settings.max_ssl_handshake_roundtrips; - MAX_READ_LENGTH = settings.max_receive_buffer_size; - MAX_SEND_LENGTH = settings.max_send_buffer_size; - READ_TIMEOUT = settings.read_timeout; - WRITE_TIMEOUT = settings.send_timeout; - }; + local event_settings = { + ACCEPT_DELAY = settings.accept_retry_interval; + ACCEPT_QUEUE = settings.tcp_backlog; + CLEAR_DELAY = settings.event_clear_interval; + CONNECT_TIMEOUT = settings.connect_timeout; + DEBUG = settings.debug; + HANDSHAKE_TIMEOUT = settings.ssl_handshake_timeout; + MAX_CONNECTIONS = settings.max_connections; + MAX_HANDSHAKE_ATTEMPTS = settings.max_ssl_handshake_roundtrips; + MAX_READ_LENGTH = settings.max_receive_buffer_size; + MAX_SEND_LENGTH = settings.max_send_buffer_size; + READ_TIMEOUT = settings.read_timeout; + WRITE_TIMEOUT = settings.send_timeout; + }; - for k,default in pairs(defaults) do - server.cfg[k] = event_settings[k] or default; - end + for k,default in pairs(defaults) do + server.cfg[k] = event_settings[k] or default; + end end elseif server_type == "select" then server = require "net.server_select"; @@ -55,12 +55,12 @@ defaults[k] = v; end function set_config(settings) - local select_settings = {}; - for k,default in pairs(defaults) do - select_settings[k] = settings[k] or default; + local select_settings = {}; + for k,default in pairs(defaults) do + select_settings[k] = settings[k] or default; + end + server.changesettings(select_settings); end - server.changesettings(select_settings); - end else error("Unsupported server type") end