prosody
5879264e28e2%3A81e68e5afce2
Software / code / prosody
Changeset
579:81e68e5afce2
Merge from waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 06 Dec 2008 20:25:51 +0000 |
| parents | 577:22f54a04471f (diff) 578:5879264e28e2 (current diff) |
| children | 580:9ff2c3c87065 589:d564f94d5727 |
| files | core/modulemanager.lua |
| diffstat | 4 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/core/hostmanager.lua Sun Dec 07 01:06:10 2008 +0500 +++ b/core/hostmanager.lua Sat Dec 06 20:25:51 2008 +0000 @@ -1,10 +1,10 @@ - -hosts = {}; local hosts = hosts; local configmanager = require "core.configmanager"; local eventmanager = require "core.eventmanager"; +local log = require "util.logger".init("hostmanager"); + local pairs = pairs; module "hostmanager" @@ -23,13 +23,13 @@ function activate(host, host_config) hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} }; - + log("info", "Activated host: %s", host); eventmanager.fire_event("host-activated", host, host_config); end function deactivate(host) local host_session = hosts[host]; - + log("info", "Deactivating host: %s", host); eventmanager.fire_event("host-deactivating", host, host_session); -- Disconnect local users, s2s connections @@ -42,6 +42,7 @@ hosts[host] = nil; eventmanager.fire_event("host-deactivated", host); + log("info", "Deactivated host: %s", host); end function getconfig(name)
--- a/core/modulemanager.lua Sun Dec 07 01:06:10 2008 +0500 +++ b/core/modulemanager.lua Sat Dec 06 20:25:51 2008 +0000 @@ -224,7 +224,7 @@ end); end -api.add_event_hook = eventmanager.add_event_hook; +function api:add_event_hook (...) return eventmanager.add_event_hook(...); end local function __add_handler(module, origin_type, tag, xmlns, handler) local handlers = stanza_handlers[module.host];
--- a/prosody Sun Dec 07 01:06:10 2008 +0500 +++ b/prosody Sat Dec 06 20:25:51 2008 +0000 @@ -68,8 +68,6 @@ end end -require "util.datamanager".set_data_path(data_path); - local server = require "net.server" require "util.dependencies" @@ -78,7 +76,6 @@ sessions = {}; hosts = {}; - -- Load and initialise core modules -- require "util.import" @@ -104,9 +101,13 @@ ------------------------------------------------------------------------ + ------------- Begin code without a home --------------------- local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; +require "util.datamanager".set_data_path(data_path); + + local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end local _mkdir = {} function mkdir(path)
