X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fserver%2Fmodpython%2FSfaAggregateModPython.py;h=3a87017e7a6eebcfce934dcfbd2765c475ce3582;hb=3147e8e089dd44e40b852cc121483189807ffa9b;hp=e1ab86dc73bf17d593f6f42448e6cf838238f989;hpb=c4937c13102b48d9dca186a1c4854fd376e52cfa;p=sfa.git

diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py
index e1ab86dc..3a87017e 100755
--- a/sfa/server/modpython/SfaAggregateModPython.py
+++ b/sfa/server/modpython/SfaAggregateModPython.py
@@ -9,26 +9,13 @@
 
 import sys
 import traceback
-import xmlrpclib
 from mod_python import apache
 
-from sfa.plc.api import SfaAPI
-from sfa.util.debug import log
+from sfa.util.sfalogging import logger
+from sfa.planetlab.server import SfaApi
 
-api = SfaAPI(interface='aggregate')
+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()
 
 def handler(req):
     try:
@@ -64,7 +51,7 @@ def handler(req):
 
         return apache.OK
 
-    except Exception, err:
+    except Exception as 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