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

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 11:25:38 +0000 (Mon, 20 Aug 2007)
New Revision: 165

Modified:
   trunk/oval-server/dba/dba.py
   trunk/oval-server/oval-server.cfg
   trunk/oval-server/oval-server.py
Log:
Clenups with dba module

Modified: trunk/oval-server/dba/dba.py
===================================================================
--- trunk/oval-server/dba/dba.py	2007-08-20 10:34:49 UTC (rev 164)
+++ trunk/oval-server/dba/dba.py	2007-08-20 11:25:38 UTC (rev 165)
@@ -11,7 +11,9 @@
 	pass
 
 class dba:
-	
+	"""
+		You need initialize static field dbPath before create instances of dba class"""
+		
 	__dbStruct = """		
 		drop table if exists agents;
 		create table agents(
@@ -40,12 +42,9 @@
 	
 	dbPath = None
 	
-	def __init__ (self, dpPath = None):
-		if self.dbPath == None:
-			if dpPath == None:
-				raise dbaNotInitialized
-			else:
-				self.dbPath = dpPath
+	def __init__ (self):
+		if dba.dbPath == None:
+			raise dbaNotInitialized
 				
 		self.__conn = db.connect(self.dbPath)
 		self.__conn.isolation_level = None

Modified: trunk/oval-server/oval-server.cfg
===================================================================
--- trunk/oval-server/oval-server.cfg	2007-08-20 10:34:49 UTC (rev 164)
+++ trunk/oval-server/oval-server.cfg	2007-08-20 11:25:38 UTC (rev 165)
@@ -3,7 +3,7 @@
 log_file = oval-server.log
 log_level = INFO
 dsa_storage = /home/blaze/tmp/oval/server/dsa
-db = /home/blaze/oval/server/oval-server.db
+db = /home/blaze/tmp/oval/server/oval-server.db
 
 [server]
 type = http
@@ -15,6 +15,6 @@
 type = local
 name = "Local OVAL definitions source"
 source = /home/blaze/tmp/oval/server/repos
-update_interval = 10m
+update_interval = 1
 
 

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-20 10:34:49 UTC (rev 164)
+++ trunk/oval-server/oval-server.py	2007-08-20 11:25:38 UTC (rev 165)
@@ -1,11 +1,15 @@
 from ConfigParser import SafeConfigParser
 from threading import Thread
-from dba import dba
 from dsa2oval import convertor
+from dba.dba import dba
 import os, logging
 import time
 
+class OvalServerNotSupported(Exception):
+	pass
+
 class httpThread(Thread):
+	
 	__status = None
 	
 	def __init__ (self, config, logger):
@@ -21,7 +25,9 @@
 			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))
-	
+		else:
+			raise OvalServerNotSupported()
+		
 	def run (self):
 		self.__status = 1
 		self.server.serve_forever()
@@ -40,17 +46,19 @@
 		self.source = config['source']
 		self.storage = config['dsa_storage']
 		self.name = config['name']
-		self.update_interval = config['update_interval']
+		self.update_interval = int(config['update_interval'])
 		self.logger = logger
 
 		if self.type == 'local':
 			from dsaSync.directory import dirSync
 			self.syncer =   dirSync(self.source, self.storage, self.logger)
 			self.logger.info('syncThread: Run local updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
+		else:
+			raise OvalServerNotSupported()
 			
 	def run (self):
 		self.__status = 1
-		self.db = dba.dba ()
+		self.db = dba ()
 		conv = convertor.Dsa2Oval ('/home/blaze/tmp/oval/server/dsa', '/home/blaze/tmp/oval/server/definitions')
 		
 		while self.__status:
@@ -66,7 +74,7 @@
 					conv.saveOvalDef('/home/blaze/tmp/oval/server/definitions/%s.xml' % agent[1])
 				
 			self.logger.debug('syncThread: sleep')
-			time.sleep(60*1)
+			time.sleep(60 * self.update_interval)
 
 	def stop(self):
 				self.__status = None
@@ -82,7 +90,7 @@
 			self.config.read(cfgfile)
 			self.dsa_storage = self.config.get('general', 'dsa_storage')
 			self.db = self.config.get('general', 'db')
-			dba.dba.dbPath = self.db
+			dba.dbPath = self.db
 			
 			try:
 				logdirname = self.config.get('general', 'log_dir')