View | Details | Raw Unified | Return to bug 36400
Collapse All | Expand All

(-)a/ucs-4.0-0/management/univention-management-console-frontend/umc/tools.js (+3 lines)
 Lines 666-671   define([ Link Here 
666 
					// validation error
 666 
					// validation error
667 
					topic.publish('/umc/actions', 'error', status);
 667 
					topic.publish('/umc/actions', 'error', status);
668 
					handleErrors.onValidationError(message, result);
 668 
					handleErrors.onValidationError(message, result);
669 
				} else if (503 == status && dialog._loginDialog && dialog._loginDialog.get('open')) {
670 
					// either the UMC-server or the UMC-Web-Server is not runnning
671 
					dialog._loginDialog.updateForm(false, statusMessage);
669 
				}
 672 
				}
670 
				/*else if (591 == status) {
 673 
				/*else if (591 == status) {
671 
					// the command could not be executed, e.g., since the user data was not correct
 674 
					// the command could not be executed, e.g., since the user data was not correct
(-)a/ucs-4.0-0/management/univention-management-console-frontend/univention-management-console-web-server (-3 / +4 lines)
 Lines 280-289   class UMCP_Dispatcher(object): Link Here 
280 
				# add a small offset to the timeout in order to avoid a mismatch between frontend and backend
 280 
				# add a small offset to the timeout in order to avoid a mismatch between frontend and backend
281 
				try:
 281 
				try:
282 
					client = SessionClient(timeout=_session_timeout + 5, ip=queuerequest.ip, cookie=queuerequest.cookie)
 282 
					client = SessionClient(timeout=_session_timeout + 5, ip=queuerequest.ip, cookie=queuerequest.cookie)
283 
				except Exception as e:
 283 
				except Exception as exc:
284 
					CORE.process('Failed to create UMC connection: %s' % str(e))
 284 
					CORE.process('Failed to create UMC connection: %s' % (exc, ))
285 
					response = umcp.Response(queuerequest.request)
 285 
					response = umcp.Response(queuerequest.request)
286 
					response.status = httplib.UNAUTHORIZED  # set status to unauthorized
 286 
					response.status = httplib.SERVICE_UNAVAILABLE
287 
					response.message = 'The UMC-server is currently not running. Please try again later.'
287 
					queuerequest.response_queue.put(response)
 288 
					queuerequest.response_queue.put(response)
288 
					continue
 289 
					continue
289 

          290
          

        






  

  Return to bug 36400