Hello Ayal Baron, Timothy Asir, Saggi Mizrahi, Federico Simoncelli, Dan
Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/8689
to review the following change.
Change subject: Change in error message format
......................................................................
Change in error message format
out, err or rc is added to error message only if its non-empty.
Change-Id: Idb948bb212ae866600aabad2190ff52f2cbc05bf
Signed-off-by: Bala.FA <[email protected]>
---
M vdsm/gluster/exception.py
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/8689/1
diff --git a/vdsm/gluster/exception.py b/vdsm/gluster/exception.py
index 6d94ae3..98f6c33 100644
--- a/vdsm/gluster/exception.py
+++ b/vdsm/gluster/exception.py
@@ -46,12 +46,20 @@
self.err = err
def __str__(self):
- return '%s\nerror: %s%s%sreturn code: %s' % \
- (self.message,
- ('\n'.join(self.out) + '\n') if self.out else '',
- ('\n'.join(self.err) + '\n') if self.err else '',
- '\n' if not (self.out or self.err) else '',
- self.rc)
+ o = '\n'.join(self.out)
+ e = '\n'.join(self.err)
+ if o and e:
+ m = o + '\n' + e
+ else:
+ m = o or e
+
+ s = self.message
+ if m:
+ s += '\nerror: ' + m
+ if self.rc:
+ s += '\nreturn code: %s' % self.rc
+
+ return s
def response(self):
return {'status': {'code': self.code, 'message': str(self),
--
To view, visit http://gerrit.ovirt.org/8689
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb948bb212ae866600aabad2190ff52f2cbc05bf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Bala.FA <[email protected]>
Gerrit-Reviewer: Ayal Baron <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Federico Simoncelli <[email protected]>
Gerrit-Reviewer: Saggi Mizrahi <[email protected]>
Gerrit-Reviewer: Timothy Asir <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
