improve socket shutdown

Author: chris-piekarski

examples/example_servers.py

@@ -67,5 +67,9 @@ def _process_message(self, obj):
 
 	for c in cPids:
 		c.close()
+
+	time.sleep(5)
+	logger.warning("Stopping server")
 	server.stop()
 	server.join()
+	logger.warning("Example script exited")

jsocket/jsocket_base.py

@@ -31,10 +31,10 @@
 logger = logging.getLogger("jsocket")
 
 class JsonSocket(object):
-	def __init__(self, address='127.0.0.1', port=5489):
+	def __init__(self, address='127.0.0.1', port=5489, timeout=2.0):
 		self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self.conn = self.socket
-		self._timeout = None
+		self._timeout = timeout
 		self._address = address
 		self._port = port
 
@@ -74,17 +74,21 @@ def read_obj(self):
 		return json.loads(str(msg[0],'ascii'))
 
 	def close(self):
+		logger.debug("closing all connections")
+		self._close_connection()
 		self._close_socket()
-		if self.socket is not self.conn:
-			self._close_connection()
-			
+
 	def _close_socket(self):
 		logger.debug("closing main socket")
-		self.socket.close()
+		if self.socket.fileno() != -1:
+			self.socket.shutdown(socket.SHUT_RDWR)
+			self.socket.close()
 
 	def _close_connection(self):
 		logger.debug("closing the connection socket")
-		self.conn.close()
+		if self.conn.fileno() != -1:
+			self.conn.shutdown(socket.SHUT_RDWR)
+			self.conn.close()
 
 	def _get_timeout(self):
 		return self._timeout
@@ -152,7 +156,7 @@ def connect(self):
 			return True
 		return False
 
-	
+
 if __name__ == "__main__":
 	""" basic json echo server """
 	import threading

jsocket/tserver.py

@@ -72,7 +72,7 @@ def run(self):
 					logger.exception(e)
 					self._close_connection()
 					break
-			self.close()
+			self._close_socket()
 
 	def start(self):
 		""" Starts the threaded server. 
@@ -124,11 +124,10 @@ def run(self):
 				logger.debug("socket.timeout: %s" % e)
 				continue
 			except Exception as e:
-				logger.info("client connection broken, closing socket")
-				self._close_connection()
+				logger.info("client connection broken, exit and close connection socket")
 				self._isAlive = False
 				break
-		self.close()
+		self._close_connection()
 
 	def start(self):
 		""" Starts the factory thread. 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, Extension
 
 setup(name='jsocket',
-      version='1.9.1',
+      version='1.9.2',
       description='Python JSON Server & Client',
       author='Christopher Piekarski',
       author_email='[email protected]',