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

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-21 09:41:20 +0000 (Tue, 21 Aug 2007)
New Revision: 187

Modified:
   trunk/oval-server/oval-server.py
Log:
Try to stop server on CTRL+C

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-21 09:40:53 UTC (rev 186)
+++ trunk/oval-server/oval-server.py	2007-08-21 09:41:20 UTC (rev 187)
@@ -132,22 +132,27 @@
 	def run(self):
 		self.logger.info('mainThread.RUN')
 		
-		#Create sync thread
-		conf = self.readConfigSection('source')
-		conf['dsa_storage'] = self.dsa_storage
-		conf['workdir'] = self.config.get('server', 'workdir')
-		syncer = syncThread(conf, self.logger)
-		syncer.start()
-		
-		#Create http thread
-		conf = self.readConfigSection('server')
-		server = httpThread(conf, self.logger)
-		server.start()
-		
-		#Wait all Threads
-		syncer.join()
-		server.join()
-		
+		try:
+			#Create sync thread
+			conf = self.readConfigSection('source')
+			conf['dsa_storage'] = self.dsa_storage
+			conf['workdir'] = self.config.get('server', 'workdir')
+			syncer = syncThread(conf, self.logger)
+			syncer.start()
+			
+			#Create http thread
+			conf = self.readConfigSection('server')
+			server = httpThread(conf, self.logger)
+			server.start()
+			
+			#Wait all Threads
+			syncer.join()
+			server.join()	
+		except KeyboardInterrupt, e:
+			syncer.stop()
+			server.stop()
+			sys.stderr.write ('Execution interrupted by keyboard.')
+				
 		self.logger.info('Shutting down')
 		logging.shutdown()