tools/migration/migrator/prosody_files: Fix undefined global access of ?error?, print...

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 875140deafedd65a9fb31d22932cf4bfbd9c12be..ee2baca500062bb3b5bf293ce1b65810b9d9cbbe 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -86,6 +86,7 @@ function read_config()
                        break;
                end
        end
+       prosody.config_file = filename
        local ok, level, err = config.load(filename);
        if not ok then
                print("\n");
@@ -240,7 +241,7 @@ function init_global_state()
        function prosody.reload_config()
                log("info", "Reloading configuration file");
                prosody.events.fire_event("reloading-config");
-               local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
+               local ok, level, err = config.load(prosody.config_file);
                if not ok then
                        if level == "parser" then
                                log("error", "There was an error parsing the configuration file: %s", tostring(err));
@@ -290,12 +291,12 @@ function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
        require "util.xmppstream"
-       require "core.rostermanager"
        require "core.stanza_router"
        require "core.hostmanager"
        require "core.portmanager"
        require "core.modulemanager"
        require "core.usermanager"
+       require "core.rostermanager"
        require "core.sessionmanager"
        package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
                log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));