summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-06 00:25:43 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-06 00:25:43 -0600
commit10e58a701142d9587f7e4f7d6556191d34242e3f (patch)
treedf5a20a2025386f03cd35f01f29d673c60909fd5
parent3564bcb52d70fa0970825b349c14bda2a85b7e89 (diff)
downloadpfsense-10e58a701142d9587f7e4f7d6556191d34242e3f.zip
pfsense-10e58a701142d9587f7e4f7d6556191d34242e3f.tar.gz
clean up text
-rwxr-xr-xsrc/etc/rc.carpbackup4
-rwxr-xr-xsrc/etc/rc.carpmaster4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup
index e74ea3c..cddbc96 100755
--- a/src/etc/rc.carpbackup
+++ b/src/etc/rc.carpbackup
@@ -40,7 +40,7 @@ if (isset($_GET)) {
$argument = str_replace("\n", "", $argv[1]);
}
if (!strstr($argument, "@")) {
- log_error("Carp MASTER event triggered from wrong source {$argument}");
+ log_error("CARP master event triggered from wrong source {$argument}");
}
list($vhid, $iface) = explode("@", $argument);
@@ -52,7 +52,7 @@ $carp_iface = "{$friendly}_vip{$vhid}";
if (is_array($vips)) {
foreach ($vips as $vip) {
- $notificationmsg = sprintf('Carp cluster member "(%1$s): (%2$s)" has resumed the state "BACKUP" for vhid %3$s', $argument, $friendly_descr, $vhid);
+ $notificationmsg = sprintf('HA cluster member "(%1$s): (%2$s)" has resumed CARP state "BACKUP" for vhid %3$s', $argument, $friendly_descr, $vhid);
notify_via_smtp($notificationmsg);
notify_via_growl($notificationmsg);
diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster
index 79e8262..2441e4e 100755
--- a/src/etc/rc.carpmaster
+++ b/src/etc/rc.carpmaster
@@ -40,7 +40,7 @@ if (isset($_GET)) {
$argument = str_replace("\n", "", $argv[1]);
}
if (!strstr($argument, "@")) {
- log_error("Carp MASTER event triggered from wrong source {$argument}");
+ log_error("CARP master event triggered from wrong source {$argument}");
}
list($vhid, $iface) = explode("@", $argument);
@@ -50,7 +50,7 @@ $friendly_descr = convert_friendly_interface_to_friendly_descr($friendly);
$vips = link_interface_to_vips($friendly, '', $vhid);
$carp_iface = "{$friendly}_vip{$vhid}";
foreach ($vips as $vip) {
- $notificationmsg = sprintf('Carp cluster member "(%1$s): (%2$s)" has resumed the state "MASTER" for vhid %3$s', $argument, $friendly_descr, $vhid);
+ $notificationmsg = sprintf('HA cluster member "(%1$s): (%2$s)" has resumed CARP state "MASTER" for vhid %3$s', $argument, $friendly_descr, $vhid);
notify_via_smtp($notificationmsg);
notify_via_growl($notificationmsg);
OpenPOWER on IntegriCloud