#9604 Fixed delete_host and ignore_host
This commit is contained in:
parent
a313678dca
commit
66e083a964
|
@ -304,8 +304,8 @@ class SatelliteAgent extends HTML
|
|||
|
||||
foreach ($this->satellite_config as $line) {
|
||||
$re = '/^#*add_host \b(\S+) (\S*)/m';
|
||||
$re_disable = '/^ignore_host \b(\S+) (\S*)/m';
|
||||
$re_delete = '/^delete_host \b(\S+) (\S*)/m';
|
||||
$re_disable = '/^ignore_host \b(\S+)/m';
|
||||
$re_delete = '/^delete_host \b(\S+)/m';
|
||||
|
||||
if (preg_match($re, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) {
|
||||
$agent['address'] = $matches[1][0];
|
||||
|
@ -732,7 +732,7 @@ class SatelliteAgent extends HTML
|
|||
$this->satellite_config = $array_merge;
|
||||
|
||||
// Remove ignore_host.
|
||||
$pattern = io_safe_expreg('ignore_host '.$values['address'].' '.$values['name']);
|
||||
$pattern = io_safe_expreg('ignore_host '.$values['name']);
|
||||
$pos = preg_grep('/'.$pattern.'/', $this->satellite_config);
|
||||
|
||||
$key_pos = 0;
|
||||
|
@ -750,7 +750,7 @@ class SatelliteAgent extends HTML
|
|||
} else {
|
||||
$pos = preg_grep('/^\#INIT delete_host/', $this->satellite_config);
|
||||
if (empty($pos) === false) {
|
||||
$string_hosts = 'ignore_host '.$values['address'].' '.$values['name']."\n";
|
||||
$string_hosts = 'ignore_host '.$values['name']."\n";
|
||||
|
||||
$key_pos = 0;
|
||||
foreach ($pos as $key => $value) {
|
||||
|
@ -802,7 +802,7 @@ class SatelliteAgent extends HTML
|
|||
$this->satellite_config = $array_merge;
|
||||
|
||||
// Remove delete_host.
|
||||
$pattern = io_safe_expreg('delete_host '.$values['address'].' '.$values['name']);
|
||||
$pattern = io_safe_expreg('delete_host '.$values['name']);
|
||||
$pos = preg_grep('/'.$pattern.'/', $this->satellite_config);
|
||||
|
||||
$key_pos = 0;
|
||||
|
@ -830,7 +830,7 @@ class SatelliteAgent extends HTML
|
|||
unset($this->satellite_config[$key_pos]);
|
||||
}
|
||||
|
||||
$string_hosts = 'delete_host '.$values['address'].' '.$values['name']."\n";
|
||||
$string_hosts = 'delete_host '.$values['name']."\n";
|
||||
$pos = preg_grep('/delete_host/', $this->satellite_config);
|
||||
if (empty($pos) === false) {
|
||||
$key_pos = array_keys($pos)[(count($pos) - 1)];
|
||||
|
|
Loading…
Reference in New Issue