Dima Kuznetsov has uploaded a new change for review.
Change subject: log: Remove metadata.log ......................................................................
log: Remove metadata.log
This log exists only in the spec file and logger.conf. Removing because not used by VDSM.
Change-Id: I56537d2112b8a3e27a65984afc918afd5aa2e96c Signed-off-by: Dima Kuznetsov dkuznets@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in M vdsm/logger.conf.in 3 files changed, 6 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/29205/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index eee180e..23eef83 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -34,7 +34,6 @@
task_configure_vdsm_logs() { local vdsm_logs=" - @VDSMLOGDIR@/metadata.log @VDSMLOGDIR@/mom.log @VDSMLOGDIR@/vdsm.log " diff --git a/vdsm.spec.in b/vdsm.spec.in index 7087b7e..4c9dbb1 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -633,7 +633,7 @@ # Creating VDSM logs in this session to avoid rpmbuild # complain during the build install -dDm 0755 %{buildroot}@VDSMLOGDIR@ -touch %{buildroot}@VDSMLOGDIR@/{metadata.log,mom.log,supervdsm.log,vdsm.log} +touch %{buildroot}@VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log}
# Install the respawn utility install -Dm 0755 init/sysvinit/respawn \ @@ -710,9 +710,9 @@ # After vdsm install we should create the logs files. # In the install session we create it but since we use # the ghost macro (in files session) the files are not included -touch @VDSMLOGDIR@/{metadata.log,mom.log,supervdsm.log,vdsm.log} -chmod 0644 @VDSMLOGDIR@/{metadata.log,mom.log,supervdsm.log,vdsm.log} -chown @VDSMUSER@:@VDSMGROUP@ @VDSMLOGDIR@/{metadata.log,mom.log,vdsm.log} +touch @VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log} +chmod 0644 @VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log} +chown @VDSMUSER@:@VDSMGROUP@ @VDSMLOGDIR@/{mom.log,vdsm.log} chown root:root @VDSMLOGDIR@/supervdsm.log
# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf. @@ -891,7 +891,6 @@ %endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@ -%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR@/metadata.log %ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR@/mom.log %ghost %config %attr(0644, root, root) @VDSMLOGDIR@/supervdsm.log %ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR@/vdsm.log diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in index e7ff032..5b0cf63 100644 --- a/vdsm/logger.conf.in +++ b/vdsm/logger.conf.in @@ -1,8 +1,8 @@ [loggers] -keys=root,vds,Storage,metadata,ovirt_hosted_engine_ha +keys=root,vds,Storage,ovirt_hosted_engine_ha
[handlers] -keys=console,syslog,logfile,metadata +keys=console,syslog,logfile
[formatters] keys=long,simple,none,sysform @@ -24,12 +24,6 @@ qualname=Storage propagate=0
-[logger_metadata] -level=WARNING -handlers=metadata -qualname=irs.metadata -propagate=0 - [logger_ovirt_hosted_engine_ha] level=ERROR handlers= @@ -47,12 +41,6 @@ args=('@VDSMLOGDIR@/vdsm.log',) filters=storage.misc.TracebackRepeatFilter level=DEBUG -formatter=long - -[handler_metadata] -class=logging.handlers.WatchedFileHandler -args=('@VDSMLOGDIR@/metadata.log',) -level=WARNING formatter=long
[handler_console]
Dima Kuznetsov has posted comments on this change.
Change subject: log: Remove metadata.log ......................................................................
Patch Set 1:
backport of http://gerrit.ovirt.org/#/c/28903/
Yaniv Bronhaim has posted comments on this change.
Change subject: log: Remove metadata.log ......................................................................
Patch Set 1: Code-Review+2
Yaniv Bronhaim has posted comments on this change.
Change subject: log: Remove metadata.log ......................................................................
Patch Set 1: Verified+1
Yaniv Bronhaim has submitted this change and it was merged.
Change subject: log: Remove metadata.log ......................................................................
log: Remove metadata.log
This log exists only in the spec file and logger.conf. Removing because not used by VDSM.
Change-Id: I56537d2112b8a3e27a65984afc918afd5aa2e96c Signed-off-by: Dima Kuznetsov dkuznets@redhat.com Reviewed-on: http://gerrit.ovirt.org/29205 Reviewed-by: Yaniv Bronhaim ybronhei@redhat.com Tested-by: Yaniv Bronhaim ybronhei@redhat.com --- M init/vdsmd_init_common.sh.in M vdsm.spec.in M vdsm/logger.conf.in 3 files changed, 6 insertions(+), 20 deletions(-)
Approvals: Yaniv Bronhaim: Verified; Looks good to me, approved
oVirt Jenkins CI Server has posted comments on this change.
Change subject: log: Remove metadata.log ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms_merged/4/ : SUCCESS
vdsm-patches@lists.fedorahosted.org