From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 21 Dec 2010 22:26:22 +0000 (+0000)
Subject: prosody: Catch a recursive Include error and print a more friendly error
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=dfd2e75cb3b5921225b2bca683b2e5f890a70c91;p=prosody.git

prosody: Catch a recursive Include error and print a more friendly error
---

diff --git a/prosody b/prosody
index d4bf7578..07ec2bdb 100755
--- 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.");