X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fmodpython%2FSfaAggregateModPython.py;h=8638ce9cc00c19726a5efcd10cd17e4f499bcbbe;hb=7e37315fd8f26d2e9376c26e83d9c2aff0482541;hp=e1ab86dc73bf17d593f6f42448e6cf838238f989;hpb=c4937c13102b48d9dca186a1c4854fd376e52cfa;p=sfa.git

diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py
index e1ab86dc..8638ce9c 100755
--- a/sfa/server/modpython/SfaAggregateModPython.py
+++ b/sfa/server/modpython/SfaAggregateModPython.py
@@ -12,23 +12,10 @@ import traceback
 import xmlrpclib
 from mod_python import apache
 
-from sfa.plc.api import SfaAPI
-from sfa.util.debug import log
+from sfa.plc.plcsfaapi import PlcSfaApi
+from sfa.util.sfalogging import logger
 
-api = SfaAPI(interface='aggregate')
-
-class unbuffered:
-    """
-    Write to /var/log/httpd/error_log. See
-
-    http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp
-    """
-
-    def write(self, data):
-        sys.stderr.write(data)
-        sys.stderr.flush()
-
-#log = unbuffered()
+api = PlcSfaApi(interface='aggregate')
 
 def handler(req):
     try:
@@ -66,5 +53,5 @@ def handler(req):
 
     except Exception, err:
         # Log error in /var/log/httpd/(ssl_)?error_log
-        print >> log, err, traceback.format_exc()
+        logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR