From 8096811531aaf2040bfcd0e4f14b11aa9ff66e7a Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 13 Jun 2017 03:30:37 +0200 Subject: Refactored AuditVerify (part 3). The AuditVerify.verify() has been cleaned up and some debug messages have been added for clarity. https://pagure.io/dogtagpki/issue/2634 Change-Id: Id1c510dd0081e3abb4fb34da0737ea6a3a335ba4 --- base/server/python/pki/server/cli/audit.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/cli/audit.py b/base/server/python/pki/server/cli/audit.py index a19ca8c65..665fe9103 100644 --- a/base/server/python/pki/server/cli/audit.py +++ b/base/server/python/pki/server/cli/audit.py @@ -53,6 +53,7 @@ class AuditFileFindCLI(pki.cli.CLI): print('Usage: pki-server %s-audit-file-find [OPTIONS]' % self.parent.parent.name) print() print(' -i, --instance Instance ID (default: pki-tomcat).') + print(' -v, --verbose Run in verbose mode.') print(' --help Show help message.') print() @@ -126,6 +127,7 @@ class AuditFileVerifyCLI(pki.cli.CLI): print('Usage: pki-server %s-audit-file-verify [OPTIONS]' % self.parent.parent.name) print() print(' -i, --instance Instance ID (default: pki-tomcat).') + print(' -v, --verbose Run in verbose mode.') print(' --help Show help message.') print() @@ -186,10 +188,15 @@ class AuditFileVerifyCLI(pki.cli.CLI): for filename in log_files: f.write(os.path.join(log_dir, filename) + '\n') - cmd = ['AuditVerify', - '-d', instance.nssdb_dir, - '-n', signing_cert['nickname'], - '-a', file_list] + cmd = ['AuditVerify'] + + if self.verbose: + cmd.append('-v') + + cmd.extend([ + '-d', instance.nssdb_dir, + '-n', signing_cert['nickname'], + '-a', file_list]) if self.verbose: print('Command: %s' % ' '.join(cmd)) -- cgit