Keith Robertson has uploaded a new change for review.
Change subject: tools: Fix locale issue (BZ858918)
......................................................................
tools: Fix locale issue (BZ858918)
Removed md5sum check as it isn't really
necessary.
Change-Id: Iaa74a561bcc2e585e73d0a53cb0cea250e4eaa49
Signed-off-by: Keith Robertson <krobe...@redhat.com>
---
M src/rhev/logcollector.py
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector
refs/changes/19/8919/1
diff --git a/src/rhev/logcollector.py b/src/rhev/logcollector.py
index 759373f..22f63e0 100644
--- a/src/rhev/logcollector.py
+++ b/src/rhev/logcollector.py
@@ -462,25 +462,11 @@
self.caller.call('%(scp_cmd)s:%(path)s
%(hypervisor_dir)s/%(archive_name)s')
self.caller.call('%(ssh_cmd)s "/bin/rm %(path)s*"')
- # setting up a pipeline since passing stdin to communicate doesn't
seem to work
- echo_cmd = self.caller.prep('/bin/echo "%(checksum)s
%(hypervisor_dir)s/%(archive_name)s"')
- md5sum_cmd = self.caller.prep("/usr/bin/md5sum -c -")
- result = None
-
- p1 = subprocess.Popen(echo_cmd, stdout=subprocess.PIPE)
- p2 = subprocess.Popen(md5sum_cmd, stdin=p1.stdout,
stdout=subprocess.PIPE)
- result = p2.communicate()[0]
-
stdout = self.caller.call('%(ssh_cmd)s "date --iso-8601=seconds"')
try:
self.get_time_diff(stdout)
except ValueError, e:
logging.debug("get_time_diff: " + str(e))
-
- if result and "OK" not in result:
- logging.error("checksum test: " + result)
- raise Exception("%(local_scratch_dir)s/%(filename)s failed
checksum test!" % self.configuration)
-
except Exception, e:
ExitCodes.exit_code=ExitCodes.WARN
logging.error("Failed to collect logs from: %s; %s" %
(self.configuration.get("hostname"), e))
--
To view, visit http://gerrit.ovirt.org/8919
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa74a561bcc2e585e73d0a53cb0cea250e4eaa49
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: master
Gerrit-Owner: Keith Robertson <krobe...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
