aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-02 04:53:31 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-02 04:53:31 +0100
commit678d1273e3ac128724618e2862c317f2a1e670d6 (patch)
treefba6c96f47adc9bd63f5411c1b8e70d23afb8a71 /prosodyctl
parentaa77e7d21a732eef4005f930ca81077bb67153a2 (diff)
downloadprosody-678d1273e3ac128724618e2862c317f2a1e670d6.tar.gz
prosody-678d1273e3ac128724618e2862c317f2a1e670d6.zip
prosodyctl: Use prosodyctl_timeout option if it exists in the config
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl6
1 files changed, 4 insertions, 2 deletions
diff --git a/prosodyctl b/prosodyctl
index 0ddc6bcf..980aa329 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -164,6 +164,8 @@ local function read_password()
end
return password;
end
+
+local prosodyctl_timeout = (config.get("*", "core", "prosodyctl_timeout") or 5) * 2;
-----------------------
local commands = {};
local command = arg[1];
@@ -300,7 +302,7 @@ function commands.start(arg)
break;
elseif i == 5 then
show_message("Still waiting...");
- elseif i >= 10 then
+ elseif i >= prosodyctl_timeout then
show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
return 2;
end
@@ -370,7 +372,7 @@ function commands.stop(arg)
break;
elseif i == 5 then
show_message("Still waiting...");
- elseif i >= 10 then
+ elseif i >= prosodyctl_timeout then
show_message("Prosody is still running. Please give it some time or check your log files for errors.");
return 2;
end