prosody, prosodyctl: Create prosody object as a local before exporting as a global

[prosody.git] / prosody

diff --git a/prosody b/prosody
index fdfee2b439f51b99380202facb6a4ab2c0caef53..b093e4fdd08c3d1b2dd1f0efcf5466732dc2bb82 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -7,6 +7,8 @@
 -- COPYING file in the source package for more information.
 --
 
+-- prosody - main executable for Prosody XMPP server
+
 -- Will be modified by configure script if run --
 
 CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
@@ -30,8 +32,14 @@ if CFG_DATADIR then
 end
 
 -- Global 'prosody' object
-prosody = { events = require "util.events".new(); };
-local prosody = prosody;
+local prosody = { events = require "util.events".new(); };
+_G.prosody = prosody;
+
+-- Check dependencies
+local dependencies = require "util.dependencies";
+if not dependencies.check_dependencies() then
+       os.exit(1);
+end
 
 -- Load the config-parsing module
 config = require "core.configmanager"
@@ -69,9 +77,15 @@ function read_config()
                print("\n");
                print("**************************");
                if level == "parser" then
-                       print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+                       print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":");
+                       print("");
                        local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)");
-                       print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err)));
+                       if err:match("chunk has too many syntax levels$") then
+                               print("An Include statement in a config file is including an already-included");
+                               print("file and causing an infinite loop. An Include statement in a config file is...");
+                       else
+                               print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err)));
+                       end
                        print("");
                elseif level == "file" then
                        print("Prosody was unable to find the configuration file.");
@@ -97,11 +111,8 @@ function init_logging()
        require "core.loggingmanager"
 end
 
-function check_dependencies()
-       -- Check runtime dependencies
-       if not require "util.dependencies".check_dependencies() then
-               os.exit(1);
-       end
+function log_dependency_warnings()
+       dependencies.log_warnings();
 end
 
 function sandbox_require()
@@ -163,23 +174,6 @@ function init_global_state()
        prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
                          plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
        
-       local path_sep = package.config:sub(1,1);
-       local rel_path_start = ".."..path_sep;
-       function prosody.resolve_relative_path(parent_path, path)
-               if path then
-                       local is_relative;
-                       if path_sep == "/" and path:sub(1,1) ~= "/" then
-                               is_relative = true;
-                       elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then
-                               is_relative = true;
-                       end
-                       if is_relative then
-                               return parent_path..path_sep..path;
-                       end
-               end
-               return path;
-       end
-       
        prosody.arg = _G.arg;
 
        prosody.platform = "unknown";
@@ -303,7 +297,6 @@ function load_secondary_libraries()
        --- Load and initialise core modules
        require "util.import"
        require "util.xmppstream"
-       require "core.xmlhandlers"
        require "core.rostermanager"
        require "core.hostmanager"
        require "core.modulemanager"
@@ -341,12 +334,6 @@ end
 function init_data_store()
        local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
        require "util.datamanager".set_data_path(data_path);
-       require "util.datamanager".add_callback(function(username, host, datastore, data)
-               if config.get(host, "core", "anonymous_login") then
-                       return false;
-               end
-               return username, host, datastore, data;
-       end);
        require "core.storagemanager";
 end
 
@@ -458,13 +445,13 @@ end
 -- previous steps to have already been performed
 read_config();
 init_logging();
-check_dependencies();
 sandbox_require();
 set_function_metatable();
 load_libraries();
 init_global_state();
 read_version();
 log("info", "Hello and welcome to Prosody version %s", prosody.version);
+log_dependency_warnings();
 load_secondary_libraries();
 init_data_store();
 init_global_protection();