Attachment 10600 Details for Bug 52681 – Workaround-for-Bug52681.patch

[patch] Workaround-for-Bug52681.patch

Workaround-for-Bug52681.patch (text/plain), 1.33 KB, created by Arvid Requate on 2021-01-24 17:15:29 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2021-01-24 17:15:29 CET

Size: 1.33 KB

patch

obsolete

>diff --git a/services/univention-s4-connector/s4-connector.py b/services/univention-s4-connector/s4-connector.py
>index 825ad121d8..013153dbc3 100644
>--- a/services/univention-s4-connector/s4-connector.py
>+++ b/services/univention-s4-connector/s4-connector.py
>@@ -118,7 +118,7 @@ def _restart_connector():
> 	try:
> 		if not subprocess.call(['pgrep', '-f', 'python.*s4connector.s4.main']):
> 			univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS, "s4-connector: restarting connector ...")
>-			subprocess.call(('service', 'univention-s4-connector', 'restart'))
>+			subprocess.call(('systemctl', 'restart', 'univention-s4-connector'))
> 			univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS, "s4-connector: ... done")
> 	finally:
> 		listener.unsetuid()
>@@ -138,7 +138,7 @@ def handler(dn, new, old, command):
> 	if b'univentionUDMProperty' in new.get('objectClass', []) or b'univentionUDMProperty' in old.get('objectClass', []):
> 		connector_needs_restart = True
> 	else:
>-		if connector_needs_restart is True:
>+		if connector_needs_restart and not s4_init_mode:
> 			_restart_connector()
> 			connector_needs_restart = False
> 
>@@ -217,7 +217,7 @@ def postrun():
> 		finally:
> 			listener.unsetuid()
> 
>-	if connector_needs_restart is True:
>+	if connector_needs_restart:
> 		_restart_connector()
> 		connector_needs_restart = False
>

Actions: View | Diff

Attachments on bug 52681: 10600