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

(-)a/services/univention-s4-connector/modules/univention/s4connector/s4/main.py (-2 / +14 lines)
 Lines 158-163   def _connect(s4, poll_sleep, baseconfig_retry_rejected): Link Here 
158
		print(time.ctime())
158
		print(time.ctime())
159
		# Aenderungen pollen
159
		# Aenderungen pollen
160
		sys.stdout.flush()
160
		sys.stdout.flush()
161
		idle = 5
161
		while True:
162
		while True:
162
			# Read changes from OpenLDAP
163
			# Read changes from OpenLDAP
163
			try:
164
			try:
 Lines 165-190   def _connect(s4, poll_sleep, baseconfig_retry_rejected): Link Here 
165
				if change_counter > 0:
166
				if change_counter > 0:
166
					# UCS changes, read again from UCS
167
					# UCS changes, read again from UCS
167
					retry_rejected = 0
168
					retry_rejected = 0
169
					idle = 0
168
					time.sleep(1)
170
					time.sleep(1)
169
					continue
171
					continue
170
				else:
172
				else:
171
					break
173
					if idle == 5:
174
						break
175
					else:
176
						time.sleep(1)
177
						idle = idle + 1
172
			except ldap.SERVER_DOWN:
178
			except ldap.SERVER_DOWN:
173
				print("Can't contact LDAP server during ucs-poll, sync not possible.")
179
				print("Can't contact LDAP server during ucs-poll, sync not possible.")
174
				connected = False
180
				connected = False
175
				sys.stdout.flush()
181
				sys.stdout.flush()
176
				break
182
				break
177
183
184
		i = 5
178
		while True:
185
		while True:
179
			try:
186
			try:
180
				change_counter = s4.poll()
187
				change_counter = s4.poll()
181
				if change_counter > 0:
188
				if change_counter > 0:
182
					# S4 changes, read again from S4
189
					# S4 changes, read again from S4
183
					retry_rejected = 0
190
					retry_rejected = 0
191
					idle = 0
184
					time.sleep(1)
192
					time.sleep(1)
185
					continue
193
					continue
186
				else:
194
				else:
187
					break
195
					if i == 5:
196
						break
197
					else:
198
						time.sleep(1)
199
						i = i + 1
188
			except ldap.SERVER_DOWN:
200
			except ldap.SERVER_DOWN:
189
				print("Can't contact LDAP server during s4-poll, sync not possible.")
201
				print("Can't contact LDAP server during s4-poll, sync not possible.")
190
				connected = False
202
				connected = False

Return to bug 52358