Report errors in the config file to the user

1 files changed, 13 insertions, 5 deletions

diff --git a/prosody b/prosody
index f63fc50d..197446e6 100755
--- a/prosody
+++ b/prosody
@@ -40,17 +40,25 @@ log = require "util.logger".init("general");
 do
 	-- TODO: Check for other formats when we add support for them
 	-- Use lfs? Make a new conf/ dir?
-	local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+	local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
 	if not ok then
 		print("");
 		print("**************************");
-		print("Prosody was unable to find the configuration file.");
-		print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
-		print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
-		print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
+		if level == "parser" then
+			print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+			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)));
+			print("");
+		elseif level == "file" then
+			print("Prosody was unable to find the configuration file.");
+			print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
+			print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
+			print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
+		end
 		print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
 		print("Good luck!");
 		print("**************************");
+		print("");
 		os.exit(1);
 	end
 end