[Oval-commits] r289 - trunk/oval-server

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-10-30 17:36:14 +0000 (Tue, 30 Oct 2007)
New Revision: 289

Modified:
   trunk/oval-server/oval-server.py
Log:
CTRL+C handling cleanup

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-10-30 17:34:03 UTC (rev 288)
+++ trunk/oval-server/oval-server.py	2007-10-30 17:36:14 UTC (rev 289)
@@ -137,7 +137,7 @@
 		self.logger.debug('Shutdown')
 
 	def stop(self):
-				self.__status = False
+		self.__status = False
 
 class mainThread:
 	""" Main program thread. 
@@ -218,9 +218,11 @@
 				server.join(10)
 
 		except KeyboardInterrupt, e:
-			sys.stderr.write ('Execution interrupted by keyboard.\n')
+			sys.stderr.write ('mainThread: Execution interrupted by keyboard.\n')
 			syncer.stop()
 			server.stop()
+			syncer.join()
+			server.join()
 			raise KeyboardInterrupt
 				
 		self.logger.info('Shutting down')