diff src/server/server.py @ 793:249e49f56f67

browser and server sides: removed constant UNMANAGED_FAULT_STRING which is used only to be displayed to the user, but it doesn't mean anything to him
author souliane <souliane@mailoo.org>
date Tue, 08 Dec 2015 00:12:51 +0100
parents 2ddd85551612
children 6a2fd7807770
line wrap: on
line diff
--- a/src/server/server.py	Mon Dec 07 15:56:18 2015 +0100
+++ b/src/server/server.py	Tue Dec 08 00:12:51 2015 +0100
@@ -829,8 +829,8 @@
                 log.info(_("Did not receive a reply (the timeout expired or the connection is broken)"))
                 request.write(C.NO_REPLY)
             else:
-                log.error(u'Unmanaged fault string %s in errback for the connection of profile %s' % (fault, profile))
-                request.write(C.UNKNOWN_ERROR % fault)
+                log.error(u'Unmanaged fault string "%s" in errback for the connection of profile %s' % (fault, profile))
+                request.write(fault)
             request.finish()
 
         self.waiting_profiles.setRequest(request, profile)
@@ -847,7 +847,7 @@
             - C.BAD_REQUEST: something is wrong in the request (bad arguments)
             - C.REGISTRATION_SUCCEED: new account has been successfully registered
             - C.ALREADY_EXISTS: the given profile already exists
-            - C.INTERNAL_ERROR or C.UNKNOWN_ERROR
+            - C.INTERNAL_ERROR or any unmanaged fault string
             - server.NOT_DONE_YET: the profile is being processed, the return
                 value will be given later (one of those previously described)
         """
@@ -875,7 +875,7 @@
                 request.write(C.INTERNAL_ERROR)
             else:
                 log.error(u'Unknown registering error: %s' % (reason,))
-                request.write(C.UNKNOWN_ERROR % reason)
+                request.write(reason)
             request.finish()
 
         d = self.asyncBridgeCall("registerSatAccount", email, password, profile)