diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-22 15:03:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-22 15:03:02 +0100 |
| commit | e02f10f2e89143ed0355996deb52df4ed2d2efde (patch) | |
| tree | 6826436cb243da87ede7abff06607216fa25fa4b /net/server.lua | |
| parent | 7d92cd0c7909499c9e2bf2d179989518fd4133dd (diff) | |
| parent | 9cfa6a9d4994b61842b2478df4470922fb3a2546 (diff) | |
| download | prosody-e02f10f2e89143ed0355996deb52df4ed2d2efde.tar.gz prosody-e02f10f2e89143ed0355996deb52df4ed2d2efde.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/net/server.lua b/net/server.lua index a753a19c..0e13399d 100644 --- a/net/server.lua +++ b/net/server.lua @@ -28,24 +28,24 @@ if server_type == "event" then 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 @@ elseif server_type == "select" then 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 |