Change in vdsm[ovirt-3.2]: Seperating supervdsm log to supervdsm.log file

ybronhei at redhat.com ybronhei at redhat.com
Wed Apr 17 06:50:37 UTC 2013


Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/13964

to review the following change.

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 <ybronhei at redhat.com>
Reviewed-on: https://gerrit.eng.lab.tlv.redhat.com/7190
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M .gitignore
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/logger.conf.in
M vdsm/supervdsmServer.py
A vdsm/svdsm.logger.conf.in
6 files changed, 38 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/13964/1

diff --git a/.gitignore b/.gitignore
index 49a78ef..6d93056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 vdsm/sos/vdsm.py
 vdsm/storage/protect/safelease
 vdsm/sudoers.vdsm
+vdsm/svdsm.logger.conf
 vdsm/vdsm-gencerts.sh
 vdsm/vdsm-logrotate.conf
 vdsm/vdsm-sosplugin.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index f8a2924..0120c3e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -668,6 +668,7 @@
 %attr (755,vdsm,kvm) %{_datadir}/%{vdsm_name}/dummybr.py*
 %attr (755,vdsm,kvm) %{_datadir}/%{vdsm_name}/nwfilter.py*
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/logger.conf
+%config(noreplace) %{_sysconfdir}/%{vdsm_name}/svdsm.logger.conf
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.conf
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/mom.policy
 %config(noreplace) %{_sysconfdir}/logrotate.d/vdsm
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 88b3287..382eaf5 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -86,6 +86,7 @@
 
 nodist_noinst_DATA = \
 	logger.conf \
+	svdsm.logger.conf \
 	mom.conf \
 	sudoers.vdsm \
 	vdsm-logrotate.conf \
@@ -124,6 +125,7 @@
 	libvirt_password \
 	limits.conf \
 	logger.conf.in \
+	svdsm.logger.conf.in \
 	mk_sysprep_floppy.in \
 	mom.conf.in \
 	mom.policy \
@@ -188,9 +190,12 @@
 install-data-logger:
 	$(MKDIR_P) $(DESTDIR)$(vdsmconfdir)
 	$(INSTALL_DATA) logger.conf $(DESTDIR)$(vdsmconfdir)/logger.conf
+	$(INSTALL_DATA) svdsm.logger.conf \
+		$(DESTDIR)$(vdsmconfdir)/svdsm.logger.conf
 
 uninstall-data-logger:
 	$(RM) $(DESTDIR)$(vdsmconfdir)/logger.conf
+	$(RM) $(DESTDIR)$(vdsmconfdir)/svdsm.logger.conf
 
 install-data-libvirtpass:
 	$(MKDIR_P) $(DESTDIR)$(vdsmtsdir)/keys
diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in
index edd4616..0a4622f 100644
--- a/vdsm/logger.conf.in
+++ b/vdsm/logger.conf.in
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,vds,Storage,metadata,SuperVdsm
+keys=root,vds,Storage,metadata
 
 [handlers]
 keys=console,syslog,logfile,metadata
@@ -22,12 +22,6 @@
 level=DEBUG
 handlers=syslog,logfile
 qualname=Storage
-propagate=0
-
-[logger_SuperVdsm]
-level=DEBUG
-handlers=syslog,logfile
-qualname=SuperVdsm
 propagate=0
 
 [logger_metadata]
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index 949a7cc..db6b778 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -84,7 +84,7 @@
 
 KB = 2 ** 10
 TEST_BUFF_LEN = 4 * KB
-LOG_CONF_PATH = "/etc/vdsm/logger.conf"
+LOG_CONF_PATH = "/etc/vdsm/svdsm.logger.conf"
 
 
 class _SuperVdsm(object):
diff --git a/vdsm/svdsm.logger.conf.in b/vdsm/svdsm.logger.conf.in
new file mode 100644
index 0000000..3728170
--- /dev/null
+++ b/vdsm/svdsm.logger.conf.in
@@ -0,0 +1,29 @@
+[loggers]
+keys=root,SuperVdsm
+
+[handlers]
+keys=logfile
+
+[formatters]
+keys=long
+
+[logger_root]
+level=DEBUG
+handlers=logfile
+propagate=0
+
+[logger_SuperVdsm]
+level=DEBUG
+handlers=logfile
+qualname=SuperVdsm
+propagate=0
+
+[handler_logfile]
+class=logging.handlers.WatchedFileHandler
+args=('@VDSMLOGDIR@/supervdsm.log',)
+filters=storage.misc.TracebackRepeatFilter
+level=DEBUG
+formatter=long
+
+[formatter_long]
+format: %(threadName)s::%(levelname)s::%(asctime)s::%(module)s::%(lineno)d::%(name)s::(%(funcName)s) %(message)s


--
To view, visit http://gerrit.ovirt.org/13964
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e5fb4a2cd5421671f942120b6718c1bb20b9e60
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.2
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list