diff --git a/net/relayd/Makefile b/net/relayd/Makefile index 52183123e..718a8d2e4 100644 --- a/net/relayd/Makefile +++ b/net/relayd/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= relayd -PLUGIN_VERSION= 1.1 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.2 PLUGIN_DEPENDS= relayd PLUGIN_COMMENT= Relayd Load Balancer PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc index a927bc1aa..89d6eff9f 100644 --- a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc +++ b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc @@ -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; } }