Diff

prosodyctl @ 8276:5ebad58b2548

prosody, prosodyctl: Print the actual config file name used when a problem loading it was encountered (see #990)
author Kim Alvefur <zash@zash.se>
date Wed, 27 Sep 2017 15:33:29 +0200
parent 8274:3798955049e3
child 8277:57c5dd08ff0a
line wrap: on
line diff
--- a/prosodyctl	Wed Sep 27 15:27:29 2017 +0200
+++ b/prosodyctl	Wed Sep 27 15:33:29 2017 +0200
@@ -93,13 +93,13 @@
 		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 "..filename);
 			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("We looked for: "..filename);
 			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