projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7a1827
)
prosody: Catch a recursive Include error and print a more friendly error
author
Matthew Wild
<mwild1@gmail.com>
Tue, 21 Dec 2010 22:26:22 +0000
(22:26 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Tue, 21 Dec 2010 22:26:22 +0000
(22:26 +0000)
prosody
patch
|
blob
|
history
diff --git
a/prosody
b/prosody
index d4bf75781f9ecf39b78bb71a8065b00800e51102..07ec2bdbda64e8cf1a87a59028f71c91c01fea35 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-77,9
+77,15
@@
function read_config()
print("\n");
print("**************************");
if level == "parser" then
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*): (.*)");
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.");
print("");
elseif level == "file" then
print("Prosody was unable to find the configuration file.");