Add a shutdown method providing immediate, but clean stop(SIGINT).

James William Pye · James William Pye · commit 58422be124d0 · 2009-03-10T01:31:53.000-07:00
start/stop = nice.
shutdown = turn things off now.
kill = destruction(you get to use ipcrm).
diff --git a/postgresql/cluster.py b/postgresql/cluster.py
@@ -201,11 +201,12 @@ def init(self,
 			+ tuple(opts) \
 			+ supw_file \
 			+ extra_args
+
 		p = sp.Popen(
 			cmd,
 			stdin = sp.PIPE,
 			stdout = logfile,
-			stderr = sp.PIPE
+			stderr = sp.PIPE,
 		)
 		p.stdin.close()
 
@@ -222,7 +223,7 @@ def init(self,
 		if rc != 0:
 			r = p.stderr.read().strip()
 			try:
-				msg = r.decode('utf-8') # :(
+				msg = r.decode('utf-8')
 			except UnicodeDecodeError:
 				# split up the lines, and use rep.
 				msg = os.linesep.join([
@@ -243,7 +244,7 @@ def drop(self):
 		Stop the cluster and remove it from the filesystem
 		"""
 		if self.running():
-			self.stop()
+			self.shutdown()
 			try:
 				self.wait_until_stopped()
 			except pg_exc.ClusterTimeoutError:
@@ -312,9 +313,7 @@ def restart(self, logfile = None, settings = None, timeout = 10):
 
 	def stop(self):
 		"""
-		Stop the cluster gracefully(SIGTERM).
-
-		Does *not* wait for shutdown.
+		Stop the cluster gracefully waiting for clients to disconnect(SIGTERM).
 		"""
 		pid = self.pid
 		if pid is not None:
@@ -324,6 +323,18 @@ def stop(self):
 				if e.errno != errno.ESRCH:
 					raise
 
+	def shutdown(self):
+		"""
+		Shutdown the cluster as soon as possible, disconnecting clients.
+		"""
+		pid = self.pid
+		if pid is not None:
+			try:
+				os.kill(pid, signal.SIGINT)
+			except OSError as e:
+				if e.errno != errno.ESRCH:
+					raise
+
 	def kill(self):
 		"""
 		Stop the cluster immediately(SIGKILL).
