MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6597 from JakubOnderka/zmq-setting-change-fix 

fix: [internal] Initialize ZMQ just when necessary after setting change
pull/6599/head
Jakub Onderka 2020-11-16 21:48:35 +01:00 committed by GitHub
parent 0683fae0bf 14efe5681c
commit a2449f9c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Model/Server.php
View File

@ -3978,18 +3978,17 @@ class Server extends AppModel
public function zmqAfterHook($setting, $value)
{
$pubSubTool = $this->getPubSubTool();
// If we are trying to change the enable setting to false, we don't need to test anything, just kill the server and return true.
if ($setting == 'Plugin.ZeroMQ_enable') {
if ($setting === 'Plugin.ZeroMQ_enable') {
if ($value == false || $value == 0) {
$pubSubTool->killService();
$this->getPubSubTool()->killService();
return true;
}
} elseif (!Configure::read('Plugin.ZeroMQ_enable')) {
// If we are changing any other ZeroMQ settings but the feature is disabled, don't reload the service
return true;
}
$pubSubTool->reloadServer();
$this->getPubSubTool()->reloadServer();
return true;
}