diff options
| author | Rob Austein <sra@hactrn.net> | 2010-03-17 17:05:09 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-03-17 17:05:09 +0000 |
| commit | c9032b266c1347440c65b2680fc09598c9d20644 (patch) | |
| tree | d9a2f76d120b4c6fbb25fc7c94c9c34193c6e7dd /rpkid | |
| parent | fdf6e2d3e141b4346fc1ce39d9064dc71bf71580 (diff) | |
Don't ask XML layer for verbose mode when we don't need it.
svn path=/rpkid/rpki/https.py; revision=3117
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/https.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py index c3ec7e36..14da7d0e 100644 --- a/rpkid/rpki/https.py +++ b/rpkid/rpki/https.py @@ -815,17 +815,23 @@ class caller(object): def __call__(self, cb, eb, *pdus): def done(cms): - msg, xml = self.proto.cms_msg.unwrap(cms, (self.server_ta, self.server_cert), pretty_print = True) + result = self.proto.cms_msg.unwrap(cms, (self.server_ta, self.server_cert), pretty_print = self.debug) if self.debug: + msg, xml = result print "<!-- Reply -->" print xml + else: + msg = result cb(msg) msg = self.proto.msg.query(*pdus) - cms, xml = self.proto.cms_msg.wrap(msg, self.client_key, self.client_cert, pretty_print = True) + result = self.proto.cms_msg.wrap(msg, self.client_key, self.client_cert, pretty_print = self.debug) if self.debug: + cms, xml = result print "<!-- Query -->" print xml + else: + cms = result client( client_key = self.client_key, |