diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
| commit | 2bb354db7f21a35ddeb16cee161047919f944b71 (patch) | |
| tree | 3cea0291902a5fcdc82a59e5fe1747c4f8217900 /net | |
| parent | b47879e18077b22d5cbace5ed8bb7362ec087d33 (diff) | |
| parent | afbece2a947a2583a60daf6ec70259992c357e69 (diff) | |
| download | prosody-2bb354db7f21a35ddeb16cee161047919f944b71.tar.gz prosody-2bb354db7f21a35ddeb16cee161047919f944b71.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server.lua | 18 | ||||
| -rw-r--r-- | net/server_select.lua | 13 |
2 files changed, 25 insertions, 6 deletions
diff --git a/net/server.lua b/net/server.lua index 3cdbe551..ae3d45b0 100644 --- a/net/server.lua +++ b/net/server.lua @@ -6,7 +6,7 @@ -- COPYING file in the source package for more information. -- -local use_luaevent = prosody and require "core.configmanager".get("*", "core", "use_libevent"); +local use_luaevent = prosody and require "core.configmanager".get("*", "use_libevent"); if use_luaevent then use_luaevent = pcall(require, "luaevent.core"); @@ -42,8 +42,12 @@ end if prosody then local config_get = require "core.configmanager".get; + local defaults = {}; + for k,v in pairs(server.cfg or server.getsettings()) do + defaults[k] = v; + end local function load_config() - local settings = config_get("*", "core", "network_settings") or {}; + local settings = config_get("*", "network_settings") or {}; if use_luaevent then local event_settings = { ACCEPT_DELAY = settings.event_accept_retry_interval; @@ -59,11 +63,15 @@ if prosody then WRITE_TIMEOUT = settings.send_timeout; }; - for k, v in pairs(event_settings) do - server.cfg[k] = v; + for k,default in pairs(defaults) do + server.cfg[k] = event_settings[k] or default; end else - server.changesettings(settings); + local select_settings = {}; + for k,default in pairs(defaults) do + select_settings[k] = settings[k] or default; + end + server.changesettings(select_settings); end end load_config(); diff --git a/net/server_select.lua b/net/server_select.lua index 63a94b7e..8ce9eed2 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -769,7 +769,18 @@ closeall = function( ) end getsettings = function( ) - return _selecttimeout, _sleeptime, _maxsendlen, _maxreadlen, _checkinterval, _sendtimeout, _readtimeout, nil, _maxselectlen, _maxsslhandshake, _maxfd + return { + select_timeout = _selecttimeout; + select_sleep_time = _sleeptime; + max_send_buffer_size = _maxsendlen; + max_receive_buffer_size = _maxreadlen; + select_idle_check_interval = _checkinterval; + send_timeout = _sendtimeout; + read_timeout = _readtimeout; + max_connections = _maxselectlen; + max_ssl_handshake_roundtrips = _maxsslhandshake; + highest_allowed_fd = _maxfd; + } end changesettings = function( new ) |