Merge with 0.7

Sun, 21 Feb 2010 20:53:23 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Sun, 21 Feb 2010 20:53:23 +0000
changeset 2697
780f767a5034
parent 2695
85ed64299f88 (current diff)
parent 2696
cb5acafbec62 (diff)
child 2698
4ca70ac5aa92

Merge with 0.7

--- a/prosodyctl	Sun Feb 21 17:33:37 2010 +0000
+++ b/prosodyctl	Sun Feb 21 20:53:23 2010 +0000
@@ -433,6 +433,19 @@
 	return 1;
 end
 
+function commands.restart(arg)
+	if arg[1] == "--help" then
+		show_usage([[stop]], [[Stop and start a running Prosody server]]);
+		return 1;
+	end
+	
+	local ret = commands.stop(arg);
+	if ret == 0 then
+		ret = commands.start(arg);
+	end
+	return ret;
+end
+
 -- ejabberdctl compatibility
 
 function commands.register(arg)

mercurial