It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None.
This commit is contained in:
parent
07dbb75c56
commit
fd9bef228d
|
@ -143,8 +143,8 @@ class Monitor extends AppModel {
|
|||
);
|
||||
|
||||
public function daemonControl($monitor, $command, $daemon=null) {
|
||||
if ( $monitor['Function'] == 'None' ) {
|
||||
ZM\Debug('Calling daemonControl when Function == None');
|
||||
if ($monitor['Function'] == 'None' and $command != 'stop') {
|
||||
ZM\Warning("Calling daemonControl with command $command when Function == None");
|
||||
return;
|
||||
}
|
||||
if (defined('ZM_SERVER_ID') and ($monitor['ServerId']!=ZM_SERVER_ID)) {
|
||||
|
|
Loading…
Reference in New Issue