Diff

prosodyctl @ 1459:545208bc0e84

prosodyctl: Use prosodyctl_timeout option if it exists in the config
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jul 2009 04:53:31 +0100
parent 1458:fce75b4efda9
child 1460:5882ed6219ff
line wrap: on
line diff
--- a/prosodyctl	Thu Jul 02 04:43:08 2009 +0100
+++ b/prosodyctl	Thu Jul 02 04:53:31 2009 +0100
@@ -164,6 +164,8 @@
 	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 @@
 				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 @@
 				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