Attachment #8939 for bug #39963

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

Lines 126-132 def query(self, request): Link Here

(-)a/management/univention-management-console/src/univention/management/console/base.py (-1 / +3 lines)
126	from univention.management.console.ldap import get_user_connection	126	from univention.management.console.ldap import get_user_connection
127	from univention.management.console.config import ucr	127	from univention.management.console.config import ucr
128	from univention.management.console.log import MODULE, CORE	128	from univention.management.console.log import MODULE, CORE
129	from univention.management.console.error import UMC_Error, NotAcceptable, PasswordRequired, LDAP_ServerDown	129	from univention.management.console.error import UMC_Error, NotAcceptable, PasswordRequired, LDAP_ServerDown, LDAP_ConnectionFailed
130		130
131	_ = Translation('univention.management.console').translate	131	_ = Translation('univention.management.console').translate
132		132
Lines 292-297 def error_handling(self, etype, exc, etraceback): Link Here
292	exc = exc.original_exception	292	exc = exc.original_exception
293	if isinstance(exc, ldap.SERVER_DOWN):	293	if isinstance(exc, ldap.SERVER_DOWN):
294	raise LDAP_ServerDown()	294	raise LDAP_ServerDown()
		295	if isinstance(exc, ldap.CONNECT_ERROR):
		296	raise LDAP_ConnectionFailed(exc)
295		297
296	def __error_handling(self, request, method, etype, exc, etraceback):	298	def __error_handling(self, request, method, etype, exc, etraceback):
297	message = ''	299	message = ''




		# yield _('If the problem persists additional hints about the cause can be found in the following log file(s):')
		# yield ' * /var/log/univention/management-console-server.log'
		# yield ' * /var/log/univention/management-console-module-*.log'


class LDAP_ConnectionFailed(LDAP_ServerDown):

	def __init__(self, exc):
		self.exc = exc
		super(LDAP_ConnectionFailed, self).__init__()

	def _error_msg(self):
		yield _('Cannot connect to the LDAP service.')
		yield _('Error message: %s') % (self.exc.args[0].get('info', ''),)
		yield _('The following steps can help to solve this problem:')
		if not self._is_master:
			yield ' * ' + _('Make sure the domain controller master is running and reachable from %s') % (self._fqdn,)
		yield ' * ' + _('Check the SSL certificates, proxy and firewall settings.')
		yield ' * ' + _('Restart the LDAP service on the domain controller master either via "service slapd restart" on command line or with the UMC module "System services"')
		if self._updates_available:
			yield ' * ' + _('Install the latest software updates')

Return to bug 39963

Lines 131-133 def _error_msg(self): Link Here

(-)a/management/univention-management-console/src/univention/management/console/error.py (+18 lines)
131	# yield _('If the problem persists additional hints about the cause can be found in the following log file(s):')	131	# yield _('If the problem persists additional hints about the cause can be found in the following log file(s):')
132	# yield ' * /var/log/univention/management-console-server.log'	132	# yield ' * /var/log/univention/management-console-server.log'
133	# yield ' * /var/log/univention/management-console-module-*.log'	133	# yield ' * /var/log/univention/management-console-module-*.log'
		134
		135
		136	class LDAP_ConnectionFailed(LDAP_ServerDown):
		137
		138	def __init__(self, exc):
		139	self.exc = exc
		140	super(LDAP_ConnectionFailed, self).__init__()
		141
		142	def _error_msg(self):
		143	yield _('Cannot connect to the LDAP service.')
		144	yield _('Error message: %s') % (self.exc.args[0].get('info', ''),)
		145	yield _('The following steps can help to solve this problem:')
		146	if not self._is_master:
		147	yield ' * ' + _('Make sure the domain controller master is running and reachable from %s') % (self._fqdn,)
		148	yield ' * ' + _('Check the SSL certificates, proxy and firewall settings.')
		149	yield ' * ' + _('Restart the LDAP service on the domain controller master either via "service slapd restart" on command line or with the UMC module "System services"')
		150	if self._updates_available:
		151	yield ' * ' + _('Install the latest software updates')