View | Details | Raw Unified | Return to bug 44670 | Differences between
and this patch

Collapse All | Expand All

(-)a/management/univention-management-console/src/univention/management/console/protocol/modserver.py (-7 / +7 lines)
 Lines 207-216   def error_handling(self, request, method, etype, exc, etraceback): Link Here 
207
			exc = UMC_Error(error, status=MODULE_ERR_INIT_FAILED)
207
			exc = UMC_Error(error, status=MODULE_ERR_INIT_FAILED)
208
			etype = UMC_Error
208
			etype = UMC_Error
209
209
210
		self.__init_etype = etype
211
		self.__init_exc = exc
212
		self.__init_etraceback = etraceback
213
214
		resp = Response(request)
210
		resp = Response(request)
215
		resp.status = exc.status
211
		resp.status = exc.status
216
		resp.message = str(exc)
212
		resp.message = str(exc)
 Lines 246-252   def handle(self, msg): Link Here 
246
			notifier.timer_add(shutdown_timeout, self._timed_out)
242
			notifier.timer_add(shutdown_timeout, self._timed_out)
247
			return
243
			return
248
244
249
		if not self.__handler:
245
		if self.__init_etype:
250
			notifier.timer_add(10000, self._timed_out)
246
			notifier.timer_add(10000, self._timed_out)
251
			raise self.__init_etype, self.__init_exc, self.__init_etraceback
247
			raise self.__init_etype, self.__init_exc, self.__init_etraceback
252
248
 Lines 290-297   def handle(self, msg): Link Here 
290
				try:
286
				try:
291
					self.__handler.init()
287
					self.__handler.init()
292
				except BaseException:
288
				except BaseException:
293
					self.__handler = None
289
					etype, exc, etraceback = sys.exc_info()
294
					raise
290
					self.__init_etype = etype
291
					self.__init_exc = exc
292
					self.__init_etraceback = etraceback
293
					self.error_handling(msg, 'init', *sys.exc_info())
294
					return
295
295
296
			self.response(resp)
296
			self.response(resp)
297
			return
297
			return

Return to bug 44670