From 678d1273e3ac128724618e2862c317f2a1e670d6 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 2 Jul 2009 04:53:31 +0100 Subject: prosodyctl: Use prosodyctl_timeout option if it exists in the config --- prosodyctl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'prosodyctl') 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 -- cgit v1.2.3