Merge pull request #4122 from nextcloud/fix/relaunch-bridge-on-config…

…-edit Kill matterbridge before editing the config file
nextcloud · Sep 7, 2020 · 66083b9 · 66083b9
2 parents ac2d6e6 + b03981d
commit 66083b9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
@@ -133,6 +133,11 @@ public function getBridgeLog(Room $room): string {
 	 */
 	public function editBridgeOfRoom(Room $room, bool $enabled, array $parts = []): array {
 		$currentBridge = $this->getBridgeOfRoom($room);
+		// kill matterbridge if we edit a running bridge config file so that it will be launched again
+		// matterbridge dynamic config reload does not fully work
+		if ($currentBridge['enabled'] && $enabled && $currentBridge['pid'] && $currentBridge['pid'] !== 0) {
+			$this->killPid($currentBridge['pid']);
+		}
 		$newBridge = [
 			'enabled' => $enabled,
 			'pid' => isset($currentBridge['pid']) ? $currentBridge['pid'] : 0,