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

[Pavel Vinogradov]

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

Modified:
   trunk/oval-server/oval-server.py
Log:
Remove hardcoded path

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-20 11:25:38 UTC (rev 165)
+++ trunk/oval-server/oval-server.py	2007-08-20 11:37:25 UTC (rev 166)
@@ -47,6 +47,7 @@
 		self.storage = config['dsa_storage']
 		self.name = config['name']
 		self.update_interval = int(config['update_interval'])
+		self.workdir = config['workdir']
 		self.logger = logger
 
 		if self.type == 'local':
@@ -59,7 +60,7 @@
 	def run (self):
 		self.__status = 1
 		self.db = dba ()
-		conv = convertor.Dsa2Oval ('/home/blaze/tmp/oval/server/dsa', '/home/blaze/tmp/oval/server/definitions')
+		conv = convertor.Dsa2Oval (self.storage, self.workdir)
 		
 		while self.__status:
 			self.logger.debug('syncThread: Run local sync')
@@ -71,7 +72,7 @@
 					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])
+					conv.saveOvalDef('%s/%s.xml' % (self.workdir, agent[1]))
 				
 			self.logger.debug('syncThread: sleep')
 			time.sleep(60 * self.update_interval)
@@ -92,13 +93,10 @@
 			self.db = self.config.get('general', 'db')
 			dba.dbPath = self.db
 			
-			try:
-				logdirname = self.config.get('general', 'log_dir')
-				logfilename = self.config.get('general', 'log_file')
-				self.outfilename = os.path.join(logdirname, logfilename)
-			except:
-				self.outfilename = os.path.join ('/tmp', 'oval-server.log')
-		
+			logdirname = self.config.get('general', 'log_dir')
+			logfilename = self.config.get('general', 'log_file')
+			self.outfilename = os.path.join(logdirname, logfilename)
+			
 			# Create the root handler (removing any others)
 			hdlr = logging.FileHandler(self.outfilename, 'a')
 			hdlr.setFormatter(logging.Formatter('%(asctime)s %(threadName)s %(name)s %(levelname)s %(message)s'))
@@ -130,6 +128,7 @@
 		#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()