aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-11-23 01:51:30 +0100
committerKim Alvefur <zash@zash.se>2012-11-23 01:51:30 +0100
commit6890dbd62f8dd36799ef6f17579729b95c57e015 (patch)
tree435a265cd55603c63669c3d498ba7cbaac4f9bd0
parentc3fe715df7216b3a8d5c8f6c77b01964c9b52a61 (diff)
downloadprosody-6890dbd62f8dd36799ef6f17579729b95c57e015.tar.gz
prosody-6890dbd62f8dd36799ef6f17579729b95c57e015.zip
net.server: Make server_* configurable in the config file.
-rw-r--r--net/server.lua32
1 files changed, 32 insertions, 0 deletions
diff --git a/net/server.lua b/net/server.lua
index 3fad4b45..23c6f956 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -36,9 +36,41 @@ if use_luaevent then
end
end
else
+ use_luaevent = false;
server = require "net.server_select";
end
+if prosody then
+ local config_get = require "core.configmanager".get;
+ local function load_config()
+ local settings = config_get("*", "core", "network_settings");
+ if use_luaevent then
+ local event_settings = {
+ ACCEPT_DELAY = settings.event_accept_retry_interval;
+ 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, v in pairs(event_settings) do
+ server.cfg[k] = v;
+ end
+ return true;
+ else
+ return server.changesettings(settings);
+ end
+ end
+ load_config();
+ prosody.events.add_handler("config-reloaded", load_config);
+end
+
-- require "net.server" shall now forever return this,
-- ie. server_select or server_event as chosen above.
return server;