git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge changes from HEAD
[plcapi.git]
/
PLC
/
Method.py
diff --git
a/PLC/Method.py
b/PLC/Method.py
index
552b703
..
c700eed
100644
(file)
--- a/
PLC/Method.py
+++ b/
PLC/Method.py
@@
-4,7
+4,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Method.py,v 1.2
7 2007/05/16 18:56:03
tmack Exp $
+# $Id: Method.py,v 1.2
9 2007/08/20 20:31:47
tmack Exp $
#
import xmlrpclib
#
import xmlrpclib
@@
-92,8
+92,8
@@
class Method:
result = self.call(*args, **kwds)
runtime = time.time() - start
result = self.call(*args, **kwds)
runtime = time.time() - start
- if self.api.config.PLC_API_DEBUG
or hasattr(self, 'message'):
- self.log(
0
, runtime, *args)
+ if self.api.config.PLC_API_DEBUG
: #
or hasattr(self, 'message'):
+ self.log(
None
, runtime, *args)
return result
return result
@@
-108,10
+108,10
@@
class Method:
# Prepend caller and method name to expected faults
fault.faultString = caller + ": " + self.name + ": " + fault.faultString
runtime = time.time() - start
# Prepend caller and method name to expected faults
fault.faultString = caller + ": " + self.name + ": " + fault.faultString
runtime = time.time() - start
- self.log(fault
.faultCode
, runtime, *args)
+ self.log(fault, runtime, *args)
raise fault
raise fault
- def log(self, fault
_code
, runtime, *args):
+ def log(self, fault, runtime, *args):
"""
Log the transaction
"""
"""
Log the transaction
"""
@@
-122,7
+122,9
@@
class Method:
# Create a new event
event = Event(self.api)
# Create a new event
event = Event(self.api)
- event['fault_code'] = fault_code
+ event['fault_code'] = 0
+ if fault:
+ event['fault_code'] = fault.faultCode
event['runtime'] = runtime
# Redact passwords and sessions
event['runtime'] = runtime
# Redact passwords and sessions
@@
-159,7
+161,9
@@
class Method:
# Set the message for this event
# Set the message for this event
- if hasattr(self, 'message'):
+ if fault:
+ event['message'] = fault.faultString
+ elif hasattr(self, 'message'):
event['message'] = self.message
# Commit
event['message'] = self.message
# Commit