|
Lines 1359-1366
class AD_Takeover():
|
Link Here
|
|---|
|
|---|
| 1359 |
self.samdb.modify(delta) |
1359 |
self.samdb.modify(delta) |
| 1360 |
|
1360 |
|
| 1361 |
def resync_s4connector_listener(self, progress): |
1361 |
def resync_s4connector_listener(self, progress): |
| 1362 |
log.info("Waiting for listener to finish (max. 180 seconds)") |
1362 |
log.info("Waiting for listener to finish (max. 10 minutes)") |
| 1363 |
if not wait_for_listener_replication(progress, 180): |
1363 |
if not wait_for_listener_replication(progress, 600): |
| 1364 |
log.warn("Warning: Stopping Listener now anyway.") |
1364 |
log.warn("Warning: Stopping Listener now anyway.") |
| 1365 |
|
1365 |
|
| 1366 |
# Restart Univention Directory Listener for S4 Connector |
1366 |
# Restart Univention Directory Listener for S4 Connector |
|
Lines 2104-2110
def wait_for_listener_replication(progress=None, max_time=None):
|
Link Here
|
|---|
|
|---|
| 2104 |
notifier_id_cached_value = None |
2104 |
notifier_id_cached_value = None |
| 2105 |
static_count = 0 |
2105 |
static_count = 0 |
| 2106 |
t_last_feedback = t_1 = t_0 = time.time() |
2106 |
t_last_feedback = t_1 = t_0 = time.time() |
| 2107 |
while static_count < 3: |
2107 |
while static_count < 5: |
| 2108 |
if notifier_id_cached_value: |
2108 |
if notifier_id_cached_value: |
| 2109 |
time.sleep(0.7) |
2109 |
time.sleep(0.7) |
| 2110 |
last_id = get_stable_last_id(progress) |
2110 |
last_id = get_stable_last_id(progress) |
|
Lines 2127-2133
def wait_for_listener_replication(progress=None, max_time=None):
|
Link Here
|
|---|
|
|---|
| 2127 |
delta_t_last_feedback = t_1 - t_last_feedback |
2127 |
delta_t_last_feedback = t_1 - t_last_feedback |
| 2128 |
if progress and delta_t_last_feedback >= 1: |
2128 |
if progress and delta_t_last_feedback >= 1: |
| 2129 |
t_last_feedback = t_last_feedback + delta_t_last_feedback |
2129 |
t_last_feedback = t_last_feedback + delta_t_last_feedback |
| 2130 |
progress.percentage_increment_scaled(1.0 / 32) |
2130 |
progress.percentage_increment_scaled(0.6 / 32) |
| 2131 |
|
2131 |
|
| 2132 |
return True |
2132 |
return True |
| 2133 |
|
2133 |
|
|
Lines 2247-2253
class UserRenameHandler:
|
Link Here
|
|---|
|
|---|
| 2247 |
try: |
2247 |
try: |
| 2248 |
log.debug("Renaming '%s' to '%s' in UCS LDAP." % (user.dn, new_name)) |
2248 |
log.debug("Renaming '%s' to '%s' in UCS LDAP." % (user.dn, new_name)) |
| 2249 |
user['username'] = new_name |
2249 |
user['username'] = new_name |
| 2250 |
return user.modify() |
2250 |
user.modify() |
| 2251 |
except uexceptions.ldapError as exc: |
2251 |
except uexceptions.ldapError as exc: |
| 2252 |
log.debug("Renaming of user '%s' failed: %s." % (userdn, exc,)) |
2252 |
log.debug("Renaming of user '%s' failed: %s." % (userdn, exc,)) |
| 2253 |
return |
2253 |
return |