Yaniv Bronhaim has uploaded a new change for review. Change subject: Seperating supervdsm log to supervdsm.log file ......................................................................
Seperating supervdsm log to supervdsm.log file Supervdsm as root process can change the logfile ownership to root when creating the file. Manual deletion of vdsm.log can cause this scenario. Change-Id: I2e5fb4a2cd5421671f942120b6718c1bb20b9e60 Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=912308 Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com> --- M vdsm/logger.conf.in M vdsm/storage/iscsi.py M vdsm/supervdsmServer.py 3 files changed, 17 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/12940/1 diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index edd4616..1e470d9 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -2,31 +2,31 @@ keys=root,vds,Storage,metadata,SuperVdsm [handlers] -keys=console,syslog,logfile,metadata +keys=console,syslog,supervdsmlogfile,vdsmlogfile,metadata [formatters] keys=long,simple,none,sysform [logger_root] level=DEBUG -handlers=syslog,logfile +handlers=syslog,vdsmlogfile propagate=0 [logger_vds] level=DEBUG -handlers=syslog,logfile +handlers=syslog,vdsmlogfile qualname=vds propagate=0 [logger_Storage] level=DEBUG -handlers=syslog,logfile +handlers=syslog,vdsmlogfile qualname=Storage propagate=0 [logger_SuperVdsm] level=DEBUG -handlers=syslog,logfile +handlers=syslog,supervdsmlogfile qualname=SuperVdsm propagate=0 @@ -42,13 +42,20 @@ formatter=sysform args=('/dev/log', handlers.SysLogHandler.LOG_USER) -[handler_logfile] +[handler_vdsmlogfile] class=logging.handlers.WatchedFileHandler args=('@VDSMLOGDIR@/vdsm.log',) filters=storage.misc.TracebackRepeatFilter level=DEBUG formatter=long +[handler_supervdsmlogfile] +class=logging.handlers.WatchedFileHandler +args=('@VDSMLOGDIR@/supervdsm.log',) +filters=storage.misc.TracebackRepeatFilter +level=DEBUG +formatter=long + [handler_metadata] class=logging.handlers.WatchedFileHandler args=('@VDSMLOGDIR@/metadata.log',) diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index bc93f5c..5892af1 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -373,7 +373,7 @@ @misc.samplingmethod -def forceIScsiScan(): +def forceIScsiScan(log): processes = [] minTimeout = config.getint('irs', 'scsi_rescan_minimal_timeout') maxTimeout = config.getint('irs', 'scsi_rescan_maximal_timeout') diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index d905201..2a50d55 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -86,7 +86,8 @@ UDEV_WITH_RELOAD_VERSION = 181 - log = logging.getLogger("SuperVdsm.ServerCallback") + def __init__(self): + self.log = logging.getLogger("SuperVdsm") @logDecorator def ping(self, *args, **kwargs): @@ -125,7 +126,7 @@ @logDecorator def forceIScsiScan(self, *args, **kwargs): - return _forceIScsiScan(*args, **kwargs) + return _forceIScsiScan(self.log, *args, **kwargs) @logDecorator def removeDeviceMapping(self, devName): -- To view, visit http://gerrit.ovirt.org/12940 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e5fb4a2cd5421671f942120b6718c1bb20b9e60 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
