[Oval-commits] r164 - in trunk/oval-server: . OvalServer dba dsaSync

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 10:34:49 +0000 (Mon, 20 Aug 2007)
New Revision: 164

Modified:
   trunk/oval-server/OvalServer/OvalHttpServer.py
   trunk/oval-server/dba/dba.py
   trunk/oval-server/dsaSync/directory.py
   trunk/oval-server/dsaSync/sync.py
   trunk/oval-server/oval-server.cfg
   trunk/oval-server/oval-server.py
Log:
Remove hardcoded path to DB. Now in config.

Modified: trunk/oval-server/OvalServer/OvalHttpServer.py
===================================================================
--- trunk/oval-server/OvalServer/OvalHttpServer.py	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/OvalServer/OvalHttpServer.py	2007-08-20 10:34:49 UTC (rev 164)
@@ -16,7 +16,7 @@
 
 	def do_GET (self):
 		self.server.logger.info ('httpServer: Process GET %s' % self.path)
-		db = dba.dba ('/tmp/oval-server.db')
+		db = dba.dba ()
 		client_ip = self.client_address[0]
 		if db.getAgentInfo(client_ip):
 			try:

Modified: trunk/oval-server/dba/dba.py
===================================================================
--- trunk/oval-server/dba/dba.py	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/dba/dba.py	2007-08-20 10:34:49 UTC (rev 164)
@@ -37,14 +37,17 @@
 				vulnTimestamp datetime,
 				status smallint
 		);"""
-		
-	__dbPath = None
-	__conn = None
-	cursor = None
 	
-	def __init__ (self, dbpath):
-		self.__dbPath = dbpath
-		self.__conn = db.connect(self.__dbPath)
+	dbPath = None
+	
+	def __init__ (self, dpPath = None):
+		if self.dbPath == None:
+			if dpPath == None:
+				raise dbaNotInitialized
+			else:
+				self.dbPath = dpPath
+				
+		self.__conn = db.connect(self.dbPath)
 		self.__conn.isolation_level = None
 		self.cursor = self.__conn.cursor()
 		#Chech if tables exists

Modified: trunk/oval-server/dsaSync/directory.py
===================================================================
--- trunk/oval-server/dsaSync/directory.py	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/dsaSync/directory.py	2007-08-20 10:34:49 UTC (rev 164)
@@ -50,13 +50,17 @@
 		self.result = []
 		self.getLastUpdateDate()
 		self.logger.info('Syncing %s with %s' % (self.dsaStorage, self.dsaSource))
-
+		status = 0
+		
 		self.cmpdir (self.dsaSource)
 		if self.result:
 			self.syncdirs ()
+			status = 1
 		else:
 			self.logger.info('directorySync: no files to sync')
 		
+		return status
+		
 if __name__ == '__main__':
 	upd = dirSync('/home/blaze/tmp/oval/server/dsa', '/tmp/dsa')
 	upd.sync()
\ No newline at end of file

Modified: trunk/oval-server/dsaSync/sync.py
===================================================================
--- trunk/oval-server/dsaSync/sync.py	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/dsaSync/sync.py	2007-08-20 10:34:49 UTC (rev 164)
@@ -3,6 +3,7 @@
 from stat import *
 import re
 import os
+from dba import dba
  
 class DsaSync:
 	
@@ -39,8 +40,7 @@
 		self.logger.debug('dsaSync: actual set to %s' % self.actual)
 	
 	def syncfile (self, dir, file):
-		from dba import dba
-		db = dba.dba ('/tmp/oval-server.db')
+		db = dba.dba ()
 		
 		if dir:
 			path = self.dsaStorage + os.sep + dir + os.sep + file

Modified: trunk/oval-server/oval-server.cfg
===================================================================
--- trunk/oval-server/oval-server.cfg	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/oval-server.cfg	2007-08-20 10:34:49 UTC (rev 164)
@@ -3,12 +3,13 @@
 log_file = oval-server.log
 log_level = INFO
 dsa_storage = /home/blaze/tmp/oval/server/dsa
+db = /home/blaze/oval/server/oval-server.db
 
 [server]
 type = http
 ip = 127.0.0.1
 port = 8989
-workdir = /home/blaze/oval/server/definitions
+workdir = /home/blaze/tmp/oval/server/definitions
 
 [source]
 type = local

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-20 10:15:54 UTC (rev 163)
+++ trunk/oval-server/oval-server.py	2007-08-20 10:34:49 UTC (rev 164)
@@ -50,19 +50,20 @@
 			
 	def run (self):
 		self.__status = 1
-		self.db = dba.dba ('/tmp/oval-server.db')
+		self.db = dba.dba ()
 		conv = convertor.Dsa2Oval ('/home/blaze/tmp/oval/server/dsa', '/home/blaze/tmp/oval/server/definitions')
 		
 		while self.__status:
 			self.logger.debug('syncThread: Run local sync')
-			self.syncer.sync()
+			syncStatus = self.syncer.sync()
 			
-			self.logger.debug('syncThread: Run agent sync')
-#			for agent in self.db.getAgentsList():
-#				self.logger.debug('syncThread: Sync definitions for agent %s' % agent[1])
-#				files = self.db.makeDefList(int(agent[0]))
-#				data = conv.createDefList(files)
-#				conv.saveOvalDef('/tmp/dsa/%s.xml' % agent[1])
+			if syncStatus:
+				self.logger.debug('syncThread: Run agent sync')
+				for agent in self.db.getAgentsList():
+					self.logger.debug('syncThread: Sync definitions for agent %s' % agent[1])
+					files = self.db.makeDefList(int(agent[0]))
+					data = conv.createDefList(files)
+					conv.saveOvalDef('/home/blaze/tmp/oval/server/definitions/%s.xml' % agent[1])
 				
 			self.logger.debug('syncThread: sleep')
 			time.sleep(60*1)
@@ -80,6 +81,8 @@
 			# Read global server config
 			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
 			
 			try:
 				logdirname = self.config.get('general', 'log_dir')
@@ -136,14 +139,4 @@
 		
 if __name__ == "__main__":
 	main = mainThread("oval-server.cfg")
-	main.run()
-#	
-#if __name__ == "__main__":
-#	from dba import dba
-#	from dsa2oval import convertor
-#	db = dba.dba('/tmp/oval-server.db')
-#	data = db.makeDefList(1)
-#	
-#	conv = convertor.Dsa2Oval()
-#	
-#	
\ No newline at end of file
+	main.run()
\ No newline at end of file