util.xmppstream: Optimized stanza building by bypassing the stanza API.

[prosody.git] / prosody

diff --git a/prosody b/prosody
index d4bf75781f9ecf39b78bb71a8065b00800e51102..7c819214a996376282d31d3f1641fc2bea87d360 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -77,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.");
@@ -328,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