Add missing \n to Internal server error.

[software/pymin.git] / pymindaemon.py

diff --git a/pymindaemon.py b/pymindaemon.py
index 98ced487f572d76201b10703d1d5065ae89c1083..ec15356a7ab89507b5be77312088d709a05c2200 100644 (file)
--- a/pymindaemon.py
+++ b/pymindaemon.py
@@ -33,7 +33,7 @@ class PyminDaemon(eventloop.EventLoop):
     >>> PyminDaemon(('', 9999), dict(test=test_handler)).run()
     """
 
     >>> PyminDaemon(('', 9999), dict(test=test_handler)).run()
     """
 

-    def __init__(self, bind_addr, routes):
+    def __init__(self, routes=dict(), bind_addr=('', 9999)):

         r"""Initialize the PyminDaemon object.
 
         See PyminDaemon class documentation for more info.
         r"""Initialize the PyminDaemon object.
 
         See PyminDaemon class documentation for more info.


@@ -65,8 +65,13 @@ class PyminDaemon(eventloop.EventLoop):
             if result is not None:
                 result = serializer.serialize(result)
             response = u'OK '
             if result is not None:
                 result = serializer.serialize(result)
             response = u'OK '

+        except dispatcher.Error, e:
+            result = unicode(e) + u'\n'
+            response = u'ERROR '

         except Exception, e:
         except Exception, e:

-            result = unicode(e)
+            import traceback
+            result = u'Internal server error\n'
+            traceback.print_exc() # TODO logging!

             response = u'ERROR '
         if result is None:
             response += u'0'
             response = u'ERROR '
         if result is None:
             response += u'0'


@@ -94,5 +99,5 @@ if __name__ == '__main__':
         print 'echo:', message
         return message
 
         print 'echo:', message
         return message
 

-    PyminDaemon(('', 9999), dict(test=test_handler, echo=echo_handler)).run()
+    PyminDaemon(dict(test=test_handler, echo=echo_handler)).run()