Merge /home/luca/pymin

[software/pymin.git] / pymindaemon.py

diff --git a/pymindaemon.py b/pymindaemon.py
index c3fdda68674fffd65b589181f153b60d4d094d84..b7e56e4cbf4c06cd7c6736aac8df457c8b13ad27 100644 (file)
--- a/pymindaemon.py
+++ b/pymindaemon.py
@@ -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'
+            traceback.print_exc() # TODO logging!
             response = u'ERROR '
         if result is None:
             response += u'0'