diff options
| author | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-09-29 13:45:03 +0200 |
| commit | 753dbfaf91c8855555370310ecd1ac228b2ad6c8 (patch) | |
| tree | cd04cb8a03e077a91511ed8d509a4e2e83588628 /prosody | |
| parent | 9c9d5678b0e9918da455eb49994c747d777b0775 (diff) | |
| parent | 7c0cd1c22e29c9e3e9db902815ca38d73260fd68 (diff) | |
| download | prosody-753dbfaf91c8855555370310ecd1ac228b2ad6c8.tar.gz prosody-753dbfaf91c8855555370310ecd1ac228b2ad6c8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -93,7 +93,7 @@ function read_config() print("\n"); print("**************************"); if level == "parser" then - print("A problem occurred while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":"); + print("A problem occured while reading the config file "..filename); print(""); local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); if err:match("chunk has too many syntax levels$") then @@ -105,7 +105,7 @@ function read_config() 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 |