aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-06 03:41:49 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-06 03:41:49 +0000
commitdfeabed19fd81dabeb88477c716ecd4c132484c0 (patch)
treea5ccac952fd39818218b3f2e571f70545f52d142 /core
parentc0334a2ad92f5bff979f309a6276b067487c03a8 (diff)
downloadprosody-dfeabed19fd81dabeb88477c716ecd4c132484c0.tar.gz
prosody-dfeabed19fd81dabeb88477c716ecd4c132484c0.zip
Add hostmanager, and eventmanager
Diffstat (limited to 'core')
-rw-r--r--core/eventmanager.lua25
-rw-r--r--core/hostmanager.lua49
-rw-r--r--core/modulemanager.lua25
-rw-r--r--core/sessionmanager.lua10
4 files changed, 85 insertions, 24 deletions
diff --git a/core/eventmanager.lua b/core/eventmanager.lua
new file mode 100644
index 00000000..169be8e9
--- /dev/null
+++ b/core/eventmanager.lua
@@ -0,0 +1,25 @@
+
+local t_insert = table.insert;
+local ipairs = ipairs;
+
+module "eventmanager"
+
+local event_handlers = {};
+
+function add_event_hook(name, handler)
+ if not event_handlers[name] then
+ event_handlers[name] = {};
+ end
+ t_insert(event_handlers[name] , handler);
+end
+
+function fire_event(name, ...)
+ local event_handlers = event_handlers[name];
+ if event_handlers then
+ for name, handler in ipairs(event_handlers) do
+ handler(...);
+ end
+ end
+end
+
+return _M; \ No newline at end of file
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
new file mode 100644
index 00000000..a46da058
--- /dev/null
+++ b/core/hostmanager.lua
@@ -0,0 +1,49 @@
+
+hosts = {};
+
+local hosts = hosts;
+local configmanager = require "core.configmanager";
+local eventmanager = require "core.eventmanager";
+
+local pairs = pairs;
+
+module "hostmanager"
+
+local function load_enabled_hosts(config)
+ local defined_hosts = config or configmanager.getconfig();
+
+ for host, host_config in pairs(defined_hosts) do
+ if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then
+ activate(host, host_config);
+ end
+ end
+end
+
+eventmanager.add_event_hook("server-starting", load_enabled_hosts);
+
+function activate(host, host_config)
+ hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
+
+ eventmanager.fire_event("host-activated", host, host_config);
+end
+
+function deactivate(host)
+ local host_session = hosts[host];
+
+ eventmanager.fire_event("host-deactivating", host, host_session);
+
+ -- Disconnect local users, s2s connections
+ for user, session_list in pairs(host_session.sessions) do
+ for resource, session in pairs(session_list) do
+ session:close("host-gone");
+ end
+ end
+ -- Components?
+
+ hosts[host] = nil;
+ eventmanager.fire_event("host-deactivated", host);
+end
+
+function getconfig(name)
+end
+
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 532a0f86..aa59b9da 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -24,6 +24,8 @@ local plugin_dir = CFG_PLUGINDIR or "./plugins/";
local logger = require "util.logger";
local log = logger.init("modulemanager");
local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler;
+local eventmanager = require "core.eventmanager";
+
local loadfile, pcall = loadfile, pcall;
local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
@@ -182,28 +184,7 @@ function api:add_feature(xmlns)
end);
end
-
-do
- local event_handlers = {};
-
- function api:add_event_hook(name, handler)
- if not event_handlers[name] then
- event_handlers[name] = {};
- end
- t_insert(event_handlers[name] , handler);
- self:log("debug", "Subscribed to %s", name);
- end
-
- function fire_event(name, ...)
- local event_handlers = event_handlers[name];
- if event_handlers then
- for name, handler in ipairs(event_handlers) do
- handler(...);
- end
- end
- end
-end
-
+api.add_event_hook = eventmanager.add_event_hook;
local function _add_handler(module, origin_type, tag, xmlns, handler)
local handlers = stanza_handlers[module.host];
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 36111633..74a17fe5 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -35,6 +35,10 @@ local uuid_generate = require "util.uuid".generate;
local rm_load_roster = require "core.rostermanager".load_roster;
local config_get = require "core.configmanager".get;
+local fire_event = require "core.eventmanager".fire_event;
+
+local gettime = require "socket".gettime;
+
local st = require "util.stanza";
local newproxy = newproxy;
@@ -45,7 +49,7 @@ module "sessionmanager"
local open_sessions = 0;
function new_session(conn)
- local session = { conn = conn, priority = 0, type = "c2s_unauthed" };
+ local session = { conn = conn, priority = 0, type = "c2s_unauthed", conntime = gettime() };
if true then
session.trace = newproxy(true);
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
@@ -109,6 +113,8 @@ function bind_resource(session, resource)
if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
-- We don't support binding multiple resources
+ session.conntimetotal = gettime()-session.conntime;
+
resource = resource or uuid_generate();
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
@@ -175,7 +181,7 @@ function streamopened(session, attr)
local features = st.stanza("stream:features");
- modulemanager.fire_event("stream-features", session, features);
+ fire_event("stream-features", session, features);
send(features);