Kiril Nesenko has uploaded a new change for review. Change subject: Fix --ticket-number option. ......................................................................
Fix --ticket-number option. Bug-Url: https://bugzilla.redhat.com/977836 Change-Id: Ia5425f88392f309df2b6278b927d78b957220a61 Signed-off-by: Kiril Nesenko <knese...@redhat.com> --- M src/__main__.py 1 file changed, 28 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/19/18419/1 diff --git a/src/__main__.py b/src/__main__.py index 541896c..5738386 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -652,11 +652,11 @@ self.configuration['reports'] += ",gluster" cmd = """%(ssh_cmd)s " -VERSION=`/bin/rpm -q --qf '[%%{VERSION}]' sos | /bin/sed 's/\.//'`; +VERSION=`/bin/rpm -q --qf '[%%{{VERSION}}]' sos | /bin/sed 's/\.//'`; if [ "$VERSION" -ge "22" ]; then - /usr/sbin/sosreport --batch -k general.all_logs=True -o %(reports)s + /usr/sbin/sosreport {option} --batch -k general.all_logs=True -o %(reports)s elif [ "$VERSION" -ge "17" ]; then - /usr/sbin/sosreport --no-progressbar -k general.all_logs=True \ + /usr/sbin/sosreport {option} --no-progressbar -k general.all_logs=True \ -o %(bc_reports)s else /bin/echo "No valid version of sosreport found." 1>&2 @@ -664,6 +664,14 @@ fi " """ + + if self.configuration.get("ticket_number"): + cmd = cmd.format(option='--ticket-number={number}'.format( + number=self.configuration.get("ticket_number") + )) + else: + cmd = cmd.format(option='') + return self.caller.call(cmd) def run(self): @@ -786,9 +794,12 @@ def sosreport(self): opt = "" + if self.configuration.get("ticket_number"): + opt += '--ticket-number=' + self.configuration.get("ticket_number") + if self.configuration.get("pg_dbhost") == "localhost": if self.configuration.get("pg_pass"): - opt = '-k postgresql.dbname=%(pg_dbname)s \ + opt += ' -k postgresql.dbname=%(pg_dbname)s \ -k postgresql.username=%(pg_user)s \ -k postgresql.password=%(pg_pass)s' @@ -882,6 +893,19 @@ report_file_ext ) ) + + if self.conf["ticket_number"]: + self.conf["path"] = os.path.join( + tempfile.gettempdir(), + "sosreport-%s-%s-%s.tar.%s" % ( + 'LogCollector', + self.conf["ticket_number"], + time.strftime("%Y%m%d%H%M%S"), + report_file_ext + ) + ) + + config = { 'report': os.path.splitext(self.conf['path'])[0], 'compressed_report': self.conf['path'], -- To view, visit http://gerrit.ovirt.org/18419 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5425f88392f309df2b6278b927d78b957220a61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: ovirt-log-collector-3.3 Gerrit-Owner: Kiril Nesenko <knese...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
