aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-02-13 14:37:15 +0000
committerMatthew Wild <mwild1@gmail.com>2009-02-13 14:37:15 +0000
commit13fd316d82218961b88a4a3d96fa25f0ab41cc3d (patch)
tree17fb5e3663bf42fe6862841a4d6a2c1a4104950e /core
parent076dbdfa11ba01f89dd9539fa0912e0ded4b99ed (diff)
downloadprosody-13fd316d82218961b88a4a3d96fa25f0ab41cc3d.tar.gz
prosody-13fd316d82218961b88a4a3d96fa25f0ab41cc3d.zip
Report errors in the config file to the user
Diffstat (limited to 'core')
-rw-r--r--core/configmanager.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index 075fcd3e..d0e70670 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -68,15 +68,15 @@ function load(filename, format)
if f then
local ok, err = parsers[format].load(f:read("*a"));
f:close();
- return ok, err;
+ return ok, "parser", err;
end
- return f, err;
+ return f, "file", err;
end
if not format then
- return nil, "no parser specified";
+ return nil, "file", "no parser specified";
else
- return nil, "no parser for "..(format);
+ return nil, "file", "no parser for "..(format);
end
end