git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
really fixed the redundant logging issue this time.
[sfa.git]
/
sfa
/
util
/
api.py
diff --git
a/sfa/util/api.py
b/sfa/util/api.py
index
f9aed1c
..
67d155e
100644
(file)
--- a/
sfa/util/api.py
+++ b/
sfa/util/api.py
@@
-8,7
+8,7
@@
import traceback
import string
import xmlrpclib
import string
import xmlrpclib
-from sfa.util.sfalogging import
sfa_
logger
+from sfa.util.sfalogging import logger
from sfa.trust.auth import Auth
from sfa.util.config import *
from sfa.util.faults import *
from sfa.trust.auth import Auth
from sfa.util.config import *
from sfa.util.faults import *
@@
-143,8
+143,8
@@
class BaseAPI:
self.credential = None
self.source = None
self.time_format = "%Y-%m-%d %H:%M:%S"
self.credential = None
self.source = None
self.time_format = "%Y-%m-%d %H:%M:%S"
- self.logger
=sfa_
logger
-
+ self.logger
=
logger
+
# load registries
from sfa.server.registry import Registries
self.registries = Registries(self)
# load registries
from sfa.server.registry import Registries
self.registries = Registries(self)
@@
-238,7
+238,7
@@
class BaseAPI:
except SfaFault, fault:
result = fault
except Exception, fault:
except SfaFault, fault:
result = fault
except Exception, fault:
-
sfa_logger()
.log_exc("BaseAPI.handle has caught Exception")
+
logger
.log_exc("BaseAPI.handle has caught Exception")
result = SfaAPIError(fault)
result = SfaAPIError(fault)