Only call interfaces_vips_configure once if it's needed, rather than doing the same thing over and over for every VIP on an interface. Ticket #6515

This commit is contained in:
Chris Buechler 2016-06-21 19:39:31 -05:00
parent 68126224e8
commit d75c55fbe2

View File

@ -5062,6 +5062,7 @@ function link_interface_to_vlans($int, $action = "") {
function link_interface_to_vips($int, $action = "", $vhid = '') {
global $config;
$updatevips = false;
if (is_array($config['virtualip']['vip'])) {
$result = array();
foreach ($config['virtualip']['vip'] as $vip) {
@ -5074,7 +5075,7 @@ function link_interface_to_vips($int, $action = "", $vhid = '') {
continue;
}
if ($action == "update") {
interfaces_vips_configure($int);
$updatevips = true;
} else {
if (empty($vhid) || ($vhid == $vip['vhid']) ||
substr($vip['interface'], 0, 4) == "_vip") {
@ -5082,6 +5083,9 @@ function link_interface_to_vips($int, $action = "", $vhid = '') {
}
}
}
if ($updatevips === true) {
interfaces_vips_configure($int);
}
return $result;
}