net/relayd: fix 'check send' config option; closes #410

This commit is contained in:
Franco Fichtner
2017-12-05 06:04:17 +00:00
parent e1e70b41d9
commit cfda7cd3d3
@@ -140,14 +140,14 @@ function relayd_configure_do($kill_first = false)
foreach ($monitors_a as $type) {
$type['options'] = isset($type['options']) ? $type['options'] : array();
switch($type['type']) {
switch ($type['type']) {
case 'icmp':
case 'tcp':
$check_a[$type['name']] = 'check ' . $type['type'];
$check_a[$type['name']] = "check {$type['type']} ";
break;
case 'http':
case 'https':
$check_a[$type['name']] = 'check ' . $type['type']. " ";
$check_a[$type['name']] = "check {$type['type']} ";
if (!empty($type['options']['path'])) {
$check_a[$type['name']] .= "'".$type['options']['path'] . "' ";
}
@@ -157,11 +157,13 @@ function relayd_configure_do($kill_first = false)
$check_a[$type['name']] .= "code " . $type['options']['code'];
break;
case 'send':
$check_a[$type['name']] = "send ";
$check_a[$type['name']] = "check {$type['type']} ";
$check_a[$type['name']] .= !empty($type['options']['send']) ? "\"{$type['options']['send']}\"" : "\"\"" ;
$check_a[$type['name']] .= " expect ";
$check_a[$type['name']] .= !empty($type['options']['expect']) ? "\"{$type['options']['expect']}\"" : "\"\"" ;
break;
default:
break;
}
}