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
Merge branch 'master' into senslab2
[sfa.git]
/
sfa
/
server
/
modpython
/
SfaRegistryModPython.py
diff --git
a/sfa/server/modpython/SfaRegistryModPython.py
b/sfa/server/modpython/SfaRegistryModPython.py
index
0c46084
..
6ea2710
100755
(executable)
--- a/
sfa/server/modpython/SfaRegistryModPython.py
+++ b/
sfa/server/modpython/SfaRegistryModPython.py
@@
-9,13
+9,12
@@
import sys
import traceback
import sys
import traceback
-import xmlrpclib
from mod_python import apache
from mod_python import apache
-from sfa.
plc.api import SfaAPI
-from sfa.
util.sfalogging import sfa_logger
+from sfa.
util.sfalogging import logger
+from sfa.
plc.server import SfaApi
-api = SfaA
PI
(interface='registry')
+api = SfaA
pi
(interface='registry')
def handler(req):
try:
def handler(req):
try:
@@
-53,5
+52,5
@@
def handler(req):
except Exception, err:
# Log error in /var/log/httpd/(ssl_)?error_log
except Exception, err:
# Log error in /var/log/httpd/(ssl_)?error_log
-
sfa_logger()
.log_exc('%r'%err)
+
logger
.log_exc('%r'%err)
return apache.HTTP_INTERNAL_SERVER_ERROR
return apache.HTTP_INTERNAL_SERVER_ERROR