Mercurial > libervia-web
comparison src/browser/sat_browser/json.py @ 694:82123705474b
massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions
author | souliane <souliane@mailoo.org> |
---|---|
date | Thu, 16 Apr 2015 14:57:02 +0200 |
parents | 7a9c7b9f6a28 |
children | b395d1309936 |
comparison
equal
deleted
inserted
replaced
693:1d60fa4d25a4 | 694:82123705474b |
---|---|
69 assert isinstance(args[-1], basestring) # Detect when we want to remove a callback (or something else) instead of the profile | 69 assert isinstance(args[-1], basestring) # Detect when we want to remove a callback (or something else) instead of the profile |
70 del args[-1] | 70 del args[-1] |
71 | 71 |
72 if kwargs: | 72 if kwargs: |
73 # kwargs should be empty here, we don't manage keyword arguments on bridge calls | 73 # kwargs should be empty here, we don't manage keyword arguments on bridge calls |
74 log.error("kwargs is not empty after treatment on method call: kwargs={}".format(kwargs)) | 74 log.error(u"kwargs is not empty after treatment on method call: kwargs={}".format(kwargs)) |
75 | 75 |
76 id_ = self._parent.callMethod(self._method, args) | 76 id_ = self._parent.callMethod(self._method, args) |
77 | 77 |
78 # callback or errback are managed in parent LiberviaJsonProxy with call id | 78 # callback or errback are managed in parent LiberviaJsonProxy with call id |
79 if callback is not None: | 79 if callback is not None: |
93 self._registerMethods(methods) | 93 self._registerMethods(methods) |
94 | 94 |
95 def _registerMethods(self, methods): | 95 def _registerMethods(self, methods): |
96 if methods: | 96 if methods: |
97 for method in methods: | 97 for method in methods: |
98 log.debug("Registering JSON method call [{}]".format(method)) | 98 log.debug(u"Registering JSON method call [{}]".format(method)) |
99 setattr(self, | 99 setattr(self, |
100 method, | 100 method, |
101 getattr(LiberviaMethodProxy(self, method), 'call') | 101 getattr(LiberviaMethodProxy(self, method), 'call') |
102 ) | 102 ) |
103 | 103 |
106 return ret | 106 return ret |
107 | 107 |
108 def call(self, method, cb, *args): | 108 def call(self, method, cb, *args): |
109 # FIXME: deprecated call method, must be removed once it's not used anymore | 109 # FIXME: deprecated call method, must be removed once it's not used anymore |
110 id_ = self.callMethod(method, args) | 110 id_ = self.callMethod(method, args) |
111 log.debug("call: method={} [id={}], args={}".format(method, id_, args)) | 111 log.debug(u"call: method={} [id={}], args={}".format(method, id_, args)) |
112 if cb: | 112 if cb: |
113 if isinstance(cb, tuple): | 113 if isinstance(cb, tuple): |
114 if len(cb) != 2: | 114 if len(cb) != 2: |
115 log.error("tuple syntax for bridge.call is (callback, errback), aborting") | 115 log.error("tuple syntax for bridge.call is (callback, errback), aborting") |
116 return | 116 return |
153 log.error("Internal server error") | 153 log.error("Internal server error") |
154 """for o in code, error, request_info: | 154 """for o in code, error, request_info: |
155 dump(o)""" | 155 dump(o)""" |
156 else: | 156 else: |
157 if isinstance(errobj['message'], dict): | 157 if isinstance(errobj['message'], dict): |
158 log.error("Error %s: %s" % (errobj['message']['faultCode'], errobj['message']['faultString'])) | 158 log.error(u"Error %s: %s" % (errobj['message']['faultCode'], errobj['message']['faultString'])) |
159 else: | 159 else: |
160 log.error("%s" % errobj['message']) | 160 log.error(u"%s" % errobj['message']) |
161 else: | 161 else: |
162 _eb((code, errobj)) | 162 _eb((code, errobj)) |
163 del self.eb[request_info.id] | 163 del self.eb[request_info.id] |
164 | 164 |
165 try: | 165 try: |
235 else: | 235 else: |
236 def _timerCb(timer): | 236 def _timerCb(timer): |
237 log.info("Trying to reconnect to server...") | 237 log.info("Trying to reconnect to server...") |
238 self.getSignals(callback=self.signalHandler) | 238 self.getSignals(callback=self.signalHandler) |
239 # TODO: display a notification to user | 239 # TODO: display a notification to user |
240 log.warning("Lost connection, trying to reconnect in {} s".format(self.retry_delay/1000)) | 240 log.warning(u"Lost connection, trying to reconnect in {} s".format(self.retry_delay / 1000)) |
241 Timer(notify=_timerCb).schedule(self.retry_delay) | 241 Timer(notify=_timerCb).schedule(self.retry_delay) |
242 self.retry_delay *= 2 | 242 self.retry_delay *= 2 |
243 | 243 |
244 def register(self, name, callback, with_profile=True): | 244 def register(self, name, callback, with_profile=True): |
245 """Register a signal | 245 """Register a signal |
246 | 246 |
247 @param: name of the signal to register | 247 @param: name of the signal to register |
248 @param callback: method to call | 248 @param callback: method to call |
249 @param with_profile: True if the original bridge method need a profile | 249 @param with_profile: True if the original bridge method need a profile |
250 """ | 250 """ |
251 log.debug("Registering signal {}".format(name)) | 251 log.debug(u"Registering signal {}".format(name)) |
252 if name in self._signals: | 252 if name in self._signals: |
253 log.error("Trying to register and already registered signal ({})".format(name)) | 253 log.error(u"Trying to register and already registered signal ({})".format(name)) |
254 else: | 254 else: |
255 self._signals[name] = (callback, with_profile) | 255 self._signals[name] = (callback, with_profile) |
256 | 256 |
257 def signalHandler(self, signal_data): | 257 def signalHandler(self, signal_data): |
258 self.getSignals(callback=self.signalHandler) | 258 self.getSignals(callback=self.signalHandler) |
259 if len(signal_data) == 1: | 259 if len(signal_data) == 1: |
260 signal_data.append([]) | 260 signal_data.append([]) |
261 log.debug("Got signal ==> name: %s, params: %s" % (signal_data[0], signal_data[1])) | 261 log.debug(u"Got signal ==> name: %s, params: %s" % (signal_data[0], signal_data[1])) |
262 name, args = signal_data | 262 name, args = signal_data |
263 try: | 263 try: |
264 callback, with_profile = self._signals[name] | 264 callback, with_profile = self._signals[name] |
265 except KeyError: | 265 except KeyError: |
266 log.warning("Ignoring {} signal: no handler registered !".format(name)) | 266 log.warning(u"Ignoring {} signal: no handler registered !".format(name)) |
267 return | 267 return |
268 if with_profile: | 268 if with_profile: |
269 args.append(C.PROF_KEY_NONE) | 269 args.append(C.PROF_KEY_NONE) |
270 callback(*args) | 270 callback(*args) |