[Oval-commits] r155 - in trunk/oval-server: . src/OvalServer src/dsa2oval/definition

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 04:28:40 +0000 (Mon, 20 Aug 2007)
New Revision: 155

Added:
   trunk/oval-server/OvalServer.TODO
Removed:
   trunk/oval-server/src/dsa2oval/definition/.generator.py.swp
Modified:
   trunk/oval-server/oval-server.py
   trunk/oval-server/src/OvalServer/OvalHttpServer.py
Log:
Cleanups in OvalServer

Added: trunk/oval-server/OvalServer.TODO
===================================================================
--- trunk/oval-server/OvalServer.TODO	                        (rev 0)
+++ trunk/oval-server/OvalServer.TODO	2007-08-20 04:28:40 UTC (rev 155)
@@ -0,0 +1,3 @@
+dsaSync:
+	Implement mail sync
+	Implement rss sync

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-20 04:28:14 UTC (rev 154)
+++ trunk/oval-server/oval-server.py	2007-08-20 04:28:40 UTC (rev 155)
@@ -16,8 +16,8 @@
 		
 		if self.type == 'http':
 			from OvalServer.OvalHttpServer import OvalHttpServer, HttpRequestHandler
-			self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler)
 			self.logger = logger
+			self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler, self.logger)
 			self.logger.info('httpThread: Run local server on %s:%d in %s' % (self.ip,  self.port, self.workdir))
 	
 	def run (self):
@@ -27,9 +27,6 @@
 	def stop (self):
 		self.__status = None
 		
-	def __del__(self):
-		self.logger.info('httpThread: Stop local server')
-		
 class syncThread(Thread):
 	
 	__status = None
@@ -57,6 +54,7 @@
 			self.syncer.sync()
 			self.logger.debug('syncThread: sleep')
 			time.sleep(60*1)
+
 	def stop(self):
 				self.__status = None
 
@@ -92,8 +90,6 @@
 			logging.shutdown()
 			exit()
 
-	def __del__(self):
-		pass
 
 	def readConfigSection (self, section):
 		conf = {}

Modified: trunk/oval-server/src/OvalServer/OvalHttpServer.py
===================================================================
--- trunk/oval-server/src/OvalServer/OvalHttpServer.py	2007-08-20 04:28:14 UTC (rev 154)
+++ trunk/oval-server/src/OvalServer/OvalHttpServer.py	2007-08-20 04:28:40 UTC (rev 155)
@@ -2,6 +2,7 @@
 from OpenSSL import SSL
 import os, sys, socket
 import xml.dom.ext
+import logging
 
 def ls (path):
 	import xml.dom.minidom
@@ -33,6 +34,8 @@
 		self.server.stop = True
 
 	def do_GET (self):
+		self.server.logger.info ('httpServer: Process GET %s' % self.path)
+		
 		try:
 			#Add check for ../../ names
 			if self.path.endswith('.xml'):
@@ -60,8 +63,18 @@
 		self.wfile = socket._fileobject(self.request, "wb", self.wbufsize)
 
 class OvalHttpServer (BaseHTTPServer.HTTPServer):
+	
+	def __init__(self, conf, handler, logger = None):
+		BaseHTTPServer.HTTPServer.__init__ (self, conf, handler)
+		if logger:
+			self.logger = logger
+		else:
+			self.logger = logging.basicConfig
+			
 	def serve_forever (self):
 		"""Handle one request at a time until stopped."""
+		self.logger.info ('httpServer: Start request handling')
+		
 		self.stop = False
 		while not self.stop:
 			self.handle_request()

Deleted: trunk/oval-server/src/dsa2oval/definition/.generator.py.swp
===================================================================
(Binary files differ)