X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/9c40f2f2d207eac67ca6add337ab5808deedea84..5b7bdbf7f0793cd5d71a7e1bcdf5f1ae2402e138:/pymindaemon.py?ds=inline

diff --git a/pymindaemon.py b/pymindaemon.py
index 98ced48..ec15356 100644
--- a/pymindaemon.py
+++ b/pymindaemon.py
@@ -33,7 +33,7 @@ class PyminDaemon(eventloop.EventLoop):
     >>> 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.
@@ -65,8 +65,13 @@ class PyminDaemon(eventloop.EventLoop):
             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:
-            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'
@@ -94,5 +99,5 @@ if __name__ == '__main__':
         print 'echo:', message
         return message
 
-    PyminDaemon(('', 9999), dict(test=test_handler, echo=echo_handler)).run()
+    PyminDaemon(dict(test=test_handler, echo=echo_handler)).run()