New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/885
commit a3bc54a492ac8821c8927a9c6f6afcad2dd3b52e
Author: Saggi Mizrahi <smizrahi(a)redhat.com>
Date: Wed Aug 31 17:24:05 2011 +0300
Remove log collector as it's no longer needed
Change-Id: I942d7c5dc3bb8858518884a4cfd061415e67af3b
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7e1b43a..2c12206 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -261,7 +261,6 @@ machines without running real guests.
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_datadir}/%{vdsm_name}/pthread.py*
%{_datadir}/%{vdsm_name}/betterThreading.py*
-%{_datadir}/%{vdsm_name}/logCollector.sh
%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_datadir}/%{vdsm_name}/storage/__init__.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 8fd4bd2..98d4b81 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -41,7 +41,6 @@ dist_vdsm_SCRIPTS = \
delNetwork \
get-conf-item \
get-vm-pid \
- logCollector.sh \
mk_sysprep_floppy \
prepare-vmchannel \
respawn \
diff --git a/vdsm/logCollector.sh b/vdsm/logCollector.sh
deleted file mode 100755
index 7b75f1e..0000000
--- a/vdsm/logCollector.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2009-2011 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Refer to the README and COPYING files for full details of the license
-#
-# Description: Logs collector for RHEV
-# Input:
-# uuid: added to output file for uniquness.
-#
-BASEDIR=/var/log
-TMPDIR=$BASEDIR/qlogs
-ERR=$TMPDIR/collectErrors.log
-DESTINATION=$BASEDIR/qlogs-${1}.tar.xz
-
-if [ -x $TMPDIR ]; then
- rm -rf $TMPDIR
-fi
-
-rm -f $BASEDIR/qlogs-*.tar.xz
-
-touch $DESTINATION
-mkdir -p $TMPDIR
-echo `date` >> $ERR
-
-/usr/sbin/sosreport --batch --tmp-dir="$TMPDIR" \
- -o
libvirt,vdsm,general,networking,hardware,process,yum,filesys,devicemapper,selinux,kernel
$@\
- >> $ERR 2>&1
-RETVAL=$?
-
-if [ "$RETVAL" -eq 0 ]; then
- mv $TMPDIR/*.tar.xz $DESTINATION
- rm -rf $TMPDIR
- exit 0
-else
- echo "Could not archive logs" | /usr/bin/tee -a >> "$ERR"
- exit 1
-fi
-