[Oval-commits] r288 - trunk/oval-server
Pavel Vinogradov
blaze-guest at alioth.debian.org
Tue Oct 30 17:34:03 UTC 2007
Author: blaze-guest
Date: 2007-10-30 17:34:03 +0000 (Tue, 30 Oct 2007)
New Revision: 288
Modified:
trunk/oval-server/oval-server.py
Log:
Comments and log-messages cleanup
Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py 2007-10-30 17:31:08 UTC (rev 287)
+++ trunk/oval-server/oval-server.py 2007-10-30 17:34:03 UTC (rev 288)
@@ -4,7 +4,7 @@
# Written by Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>
# Licensed under the GNU General Public License version 2.
-"""Start OVAL server programm."""
+"""Start OVAL server program."""
from ConfigParser import SafeConfigParser
from threading import Thread
@@ -62,7 +62,7 @@
if self.type == 'http':
from oval.server.OvalHttpServer import OvalHttpServer, HttpRequestHandler
self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler, self.workdir, self.logger)
- self.logger.info('serverThread: Run local server on %s:%d in %s' % (self.ip, self.port, self.workdir))
+ self.logger.info('Run local server on %s:%d in %s' % (self.ip, self.port, self.workdir))
else:
raise OvalServerNotSupported()
@@ -102,15 +102,15 @@
if self.type == 'local':
from oval.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))
+ self.logger.info('Run local updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
if self.type == 'http':
from oval.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))
+ self.logger.info('Run http updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
if self.type == 'ftp':
from oval.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))
+ self.logger.info('Run ftp updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
def run (self):
self.__status = True
@@ -119,22 +119,22 @@
while self.__status:
try:
- self.logger.debug('syncThread: Run local sync')
+ self.logger.debug('Run local sync')
syncStatus = self.syncer.sync()
if syncStatus:
- self.logger.debug('syncThread: Run agent sync')
+ self.logger.debug('Run agent sync')
for agent in self.db.getAgentsList():
- self.logger.debug('syncThread: Sync definitions for agent %s' % agent[1])
+ self.logger.debug('Sync definitions for agent %s' % agent[1])
files = self.db.makeDefList(int(agent[0]))
data = conv.createDefList(files)
conv.saveOvalDef('%s/%s.xml' % (self.workdir, agent[1]))
- self.logger.debug('syncThread: sleep')
+ self.logger.debug('sleep')
time.sleep(60 * self.update_interval)
except Exception, e:
self.logger.critical ('Unhandled error in Syncer thread: %s : %s.\n' % (e.__class__, str(e)))
- self.logger.debug('syncThread: Shutdown')
+ self.logger.debug('Shutdown')
def stop(self):
self.__status = False
@@ -207,7 +207,7 @@
syncer = syncThread(conf, self.logger)
syncer.start()
- #Create http thread
+ #Create server thread
conf = self.readConfigSection('server')
server = serverThread(conf, self.logger)
server.start()
More information about the Oval-commits
mailing list