From a0a80ed77e27f00c75c712dcf557cf5d11da218e Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 19 Oct 2020 19:23:54 +0200 Subject: [PATCH] TT#97400 prosody: [de]activate just the main domain * conference. subdomain was missing * mod_sipwise_vhosts_sql module is now taking care of [de]activation of the subdomains * send quit command when leaving the console to avoid error in log > Oct 19 19:22:43 sp1 (debug) prosody[25167]: socket: connection failed in read event: closed Change-Id: If1d80652efba0a587f29ecc692282c8db067e450 (cherry picked from commit 258a54de88bb748d4db29b30c439ecaa50095341) (cherry picked from commit 41970bc8c7761a869331346d2825b90fa29ec9db) --- lib/NGCP/Panel/Utils/Prosody.pm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/NGCP/Panel/Utils/Prosody.pm b/lib/NGCP/Panel/Utils/Prosody.pm index 806f2a9b6c..46647916cf 100644 --- a/lib/NGCP/Panel/Utils/Prosody.pm +++ b/lib/NGCP/Panel/Utils/Prosody.pm @@ -22,13 +22,7 @@ sub activate_domain { } else { $ok = 0; } - $t->print("host:activate('search.$domain', { component_module = 'sipwise_vjud' })"); - ($res, $amatch) = $t->waitfor('/(Result: \w+)|(Message: .+)/'); - if($amatch =~ /Result:\s*true/) { - # fine - } else { - $ok = 0; - } + $t->print("quit"); } return $ok if($ok); @@ -54,13 +48,7 @@ sub deactivate_domain { } else { $ok = 0; } - $t->print("host:deactivate('search.$domain')"); - ($res, $amatch) = $t->waitfor('/(Result: \w+)|(Message: .+)/'); - if($amatch =~ /Result:\s*true/) { - # fine - } else { - $ok = 0; - } + $t->print("quit"); } return $ok if($ok);