aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-08-28 09:23:24 +0100
committerMatthew Wild <mwild1@gmail.com>2014-08-28 09:23:24 +0100
commite5cad1e21d8d45fb12dc0f3d53767c7fb875c96c (patch)
tree29a8b368a2ebd36175100726d9d02b82b27edc8c /prosodyctl
parent5e9e11b7bc2634db4c175234f9ca9c91253bcaa8 (diff)
parent576e2186463c163cbd40ad90fc23e884ea817943 (diff)
downloadprosody-e5cad1e21d8d45fb12dc0f3d53767c7fb875c96c.tar.gz
prosody-e5cad1e21d8d45fb12dc0f3d53767c7fb875c96c.zip
Merge 0.9->0.10
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl1
1 files changed, 1 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index 1060a7c9..910b96bf 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -220,6 +220,7 @@ local error_messages = setmetatable({
["no-such-host"] = "The given hostname does not exist in the config";
["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help";
+ ["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see http://prosody.im/doc/prosodyctl#pidfile for help";
["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info";
["no-such-method"] = "This module has no commands";
["not-running"] = "Prosody is not running";