# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266785603 0
# Node ID 780f767a503482e364bd3e0cc1c8c020bf6704a9
# Parent  85ed64299f8806627352d0fa3d7a642a54fbb83b# Parent  cb5acafbec62b04f3803423df44a8bb246a8861a
Merge with 0.7

diff -r 85ed64299f88 -r 780f767a5034 prosodyctl
--- 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)