[Oval-commits] r285 - in trunk/oval-server: . oval/server

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-10-30 17:27:54 +0000 (Tue, 30 Oct 2007)
New Revision: 285

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

Modified: trunk/oval-server/oval/server/OvalHttpServer.py
===================================================================
--- trunk/oval-server/oval/server/OvalHttpServer.py	2007-10-30 17:24:41 UTC (rev 284)
+++ trunk/oval-server/oval/server/OvalHttpServer.py	2007-10-30 17:27:54 UTC (rev 285)
@@ -81,10 +81,9 @@
 	def serve_forever (self):
 		"""Handle one request at a time until stopped."""
 		self.logger.info ('httpServer: Start request handling')
-		
+
 		while self.__status:
 			self.handle_request()
-		self.logger.debug ('httpServer: Shutdown')
 			
 	def stop(self):
 		self.__status = False

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-10-30 17:24:41 UTC (rev 284)
+++ trunk/oval-server/oval-server.py	2007-10-30 17:27:54 UTC (rev 285)
@@ -29,10 +29,13 @@
 
 
 class httpThread(Thread):	
-	
+	""" HttpServer thread. 
+
+	    Server requests from clients
+	"""
 	def __init__ (self, config, logger):
 		Thread.__init__(self)
-		self.setName("httpThredad")
+		self.setName("httpThread")
 		self.type = config['type']
 		self.ip = config['ip']
 		self.port = int(config['port'])
@@ -185,11 +188,13 @@
 			#Wait all Threads
 			while syncer.isAlive() or server.isAlive():
 				syncer.join(10)
-				server.join(10)	
+				server.join(10)
+
 		except KeyboardInterrupt, e:
+			sys.stderr.write ('Execution interrupted by keyboard.\n')
 			syncer.stop()
 			server.stop()
-			sys.stderr.write ('Execution interrupted by keyboard.')
+			raise KeyboardInterrupt
 				
 		self.logger.info('Shutting down')
 		logging.shutdown()		
@@ -215,12 +220,12 @@
 	#Crate server instance and run it
 	try:
 		main = mainThread(opts['-c'])
-		main.run ()
-		
+		main.run ()	
 	except configNotFoundError, e:
 		sys.stderr.write (str(e))
 	except KeyboardInterrupt, e:
-		sys.stderr.write ('Execution interrupted by keyboard.')
+		time.sleep(20)
+		#os.system ('kill -HUP %d' % os.getpid())
 	except exceptions.SystemExit, e:
 		raise e
 	except Exception, e: