diff options
| -rw-r--r-- | core/hostmanager.lua | 9 | ||||
| -rw-r--r-- | core/modulemanager.lua | 2 | ||||
| -rwxr-xr-x | prosody | 7 | ||||
| -rw-r--r-- | util/datamanager.lua | 1 |
4 files changed, 11 insertions, 8 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua index a46da058..64bb13f7 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -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 @@ eventmanager.add_event_hook("server-starting", load_enabled_hosts); 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 @@ function deactivate(host) hosts[host] = nil; eventmanager.fire_event("host-deactivated", host); + log("info", "Deactivated host: %s", host); end function getconfig(name) diff --git a/core/modulemanager.lua b/core/modulemanager.lua index aec6358f..3f335c89 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -224,7 +224,7 @@ function api:add_feature(xmlns) 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]; @@ -68,8 +68,6 @@ do end end -require "util.datamanager".set_data_path(data_path); - local server = require "net.server" require "util.dependencies" @@ -78,7 +76,6 @@ require "util.dependencies" sessions = {}; hosts = {}; - -- Load and initialise core modules -- require "util.import" @@ -104,9 +101,13 @@ require "util.jid" ------------------------------------------------------------------------ + ------------- 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) diff --git a/util/datamanager.lua b/util/datamanager.lua index 6c9402c4..a5e478c8 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -52,6 +52,7 @@ end local data_path = "data"; function set_data_path(path) + log("info", "Setting data path to %s", path); data_path = path; end |