Let Google Hangouts contacts appear offline
[prosody.git] / prosody
diff --git a/prosody b/prosody
index 6ec9131e5a27aa49b196326ecb6e7db986d2d245..1a58fd33fc0228a4f661888966b2ed57ceedc7c7 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");
@@ -16,10 +18,22 @@ CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
+local function is_relative(path)
+       local path_sep = package.config:sub(1,1);
+        return ((path_sep == "/" and path:sub(1,1) ~= "/")
+       or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
+end
+
 -- Tell Lua where to find our libraries
 if CFG_SOURCEDIR then
-       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
-       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
+       local function filter_relative_paths(path)
+               if is_relative(path) then return ""; end
+       end
+       local function sanitise_paths(paths)
+               return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
+       end
+       package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
+       package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
 end
 
 -- Substitute ~ with path to home directory in data path
@@ -30,8 +44,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 +89,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 +123,21 @@ function init_logging()
        require "core.loggingmanager"
 end
 
-function check_dependencies()
-       -- Check runtime dependencies
-       if not require "util.dependencies".check_dependencies() then
-               os.exit(1);
+function log_dependency_warnings()
+       dependencies.log_warnings();
+end
+
+function sanity_check()
+       for host, host_config in pairs(configmanager.getconfig()) do
+               if host ~= "*"
+               and host_config.core.enabled ~= false
+               and not host_config.core.component_module then
+                       return;
+               end
        end
+       log("error", "No enabled VirtualHost entries found in the config file.");
+       log("error", "At least one active host is required for Prosody to function. Exiting...");
+       os.exit(1);
 end
 
 function sandbox_require()
@@ -160,26 +196,16 @@ function init_global_state()
        prosody.full_sessions = full_sessions;
        prosody.hosts = hosts;
        
-       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(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 CFG_CONFIGDIR..path_sep..path;
-                       end
-               end
-               return path;
+       local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+       local custom_plugin_paths = config.get("*", "core", "plugin_paths");
+       if custom_plugin_paths then
+               local path_sep = package.config:sub(3,3);
+               -- path1;path2;path3;defaultpath...
+               CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
        end
-       
+       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
+                         plugins = CFG_PLUGINDIR or "plugins", data = data_path };
+
        prosody.arg = _G.arg;
 
        prosody.platform = "unknown";
@@ -303,13 +329,16 @@ 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"
        require "core.usermanager"
        require "core.sessionmanager"
        require "core.stanza_router"
+       package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
+               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)"));
+               return function() end
+       end});
 
        require "net.http"
        
@@ -329,20 +358,14 @@ function load_secondary_libraries()
        ]]
 
        require "net.connlisteners";
+       require "net.httpserver";
        
        require "util.stanza"
        require "util.jid"
 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
 
 function prepare_to_start()
@@ -453,13 +476,14 @@ end
 -- previous steps to have already been performed
 read_config();
 init_logging();
-check_dependencies();
+sanity_check();
 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();