[Oval-commits] r169 - in trunk/oval-server: . dsaSync

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-20 13:05:30 +0000 (Mon, 20 Aug 2007)
New Revision: 169

Modified:
   trunk/oval-server/dsaSync/ftp.py
   trunk/oval-server/dsaSync/http.py
   trunk/oval-server/dsaSync/sync.py
   trunk/oval-server/oval-server.cfg
   trunk/oval-server/oval-server.py
Log:
Integrate ftp and http sync in ovar-server

Modified: trunk/oval-server/dsaSync/ftp.py
===================================================================
--- trunk/oval-server/dsaSync/ftp.py	2007-08-20 11:46:40 UTC (rev 168)
+++ trunk/oval-server/dsaSync/ftp.py	2007-08-20 13:05:30 UTC (rev 169)
@@ -78,13 +78,14 @@
 		self.dirs = []
 		self.conn.cwd(self.curdir)
 		self.conn.retrlines('LIST', self.__parse)
+		self.conn.cwd('/')
 		
 		if self.dirs:
 			dirs = self.dirs[:]
 			for dir in dirs:
 				self.curdir += '/%s' % dir
 				self.cmpdir()
-				self.conn.cwd('../')
+				#self.conn.cwd('../')
 				self.curdir = os.path.split(self.curdir)[0]
 			
 	def syncfile (self, dir, file):

Modified: trunk/oval-server/dsaSync/http.py
===================================================================
--- trunk/oval-server/dsaSync/http.py	2007-08-20 11:46:40 UTC (rev 168)
+++ trunk/oval-server/dsaSync/http.py	2007-08-20 13:05:30 UTC (rev 169)
@@ -80,7 +80,7 @@
 		self.logger.debug ('httpSync: sync dir %s' % self.dirs)
 		
 		self.dirs = []
-		logging.critical('LIST %s' % self.curdir)
+		self.logger.critical('LIST %s' % self.curdir)
 		self.conn.request('GET',self.curdir)
 		self.__parse(self.conn.getresponse().read())
 		

Modified: trunk/oval-server/dsaSync/sync.py
===================================================================
--- trunk/oval-server/dsaSync/sync.py	2007-08-20 11:46:40 UTC (rev 168)
+++ trunk/oval-server/dsaSync/sync.py	2007-08-20 13:05:30 UTC (rev 169)
@@ -3,7 +3,7 @@
 from stat import *
 import re
 import os
-from dba import dba
+from dba.dba import dba
  
 class DsaSync:
 	
@@ -40,7 +40,7 @@
 		self.logger.debug('dsaSync: actual set to %s' % self.actual)
 	
 	def syncfile (self, dir, file):
-		db = dba.dba ()
+		db = 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 11:46:40 UTC (rev 168)
+++ trunk/oval-server/oval-server.cfg	2007-08-20 13:05:30 UTC (rev 169)
@@ -17,4 +17,15 @@
 source = /home/blaze/tmp/oval/server/repos
 update_interval = 1
 
+#type = http
+#name = "OVAL http repository"
+#source = /~blaze/debian/dsa/
+#server = server
+#update_interval = 1
 
+#type = ftp
+#name = "OVAL ftp repository"
+#source = debian/dsa
+#server = server
+#update_interval = 1
+

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-20 11:46:40 UTC (rev 168)
+++ trunk/oval-server/oval-server.py	2007-08-20 13:05:30 UTC (rev 169)
@@ -20,9 +20,10 @@
 		self.port = int(config['port'])
 		self.workdir = config['workdir']
 		
+		self.logger = logger
+		
 		if self.type == 'http':
 			from OvalServer.OvalHttpServer import OvalHttpServer, HttpRequestHandler
-			self.logger = logger
 			self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler, self.workdir, self.logger)
 			self.logger.info('httpThread: Run local server on %s:%d in %s' % (self.ip,  self.port, self.workdir))
 		else:
@@ -54,8 +55,14 @@
 			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()
+		if self.type == 'http':
+			from dsaSync.http import httpSync
+			self.syncer =   httpSync(self.source, self.storage, config['server'], self.logger)
+			self.logger.info('syncThread: Run http updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
+		if self.type == 'ftp':
+			from dsaSync.ftp import ftpSync
+			self.syncer =   ftpSync(self.source, self.storage, config['server'], self.logger)
+			self.logger.info('syncThread: Run ftp updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
 			
 	def run (self):
 		self.__status = 1