aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2020-03-05 08:26:05 +0100
committerGravatar Christian Hesse <mail@eworm.de>2020-03-05 08:26:05 +0100
commit3127800496410a9f316e22c57485e83a6c2fe193 (patch)
treedd0604fbe107d9d2a46cf7a99d5c98429e1c28c4
parent1dbd91f76d4f5aac19fa8802f38a3d41ae0bec14 (diff)
daily-psk: use $LogPrintExit
-rw-r--r--daily-psk.capsman7
-rw-r--r--daily-psk.local7
-rw-r--r--daily-psk.template5
3 files changed, 11 insertions, 8 deletions
diff --git a/daily-psk.capsman b/daily-psk.capsman
index 36dfc1a..59b867e 100644
--- a/daily-psk.capsman
+++ b/daily-psk.capsman
@@ -7,9 +7,10 @@
#
# !! Do not edit this file, it is generated from template!
-:global Identity;
:global DailyPskMatchComment;
+:global Identity;
+:global LogPrintExit;
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
@@ -56,13 +57,13 @@
:local Skip 0;
:if ($NewPsk != $OldPsk) do={
- :log info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")");
+ $LogPrintExit info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
/ caps-man access-list set $AccList private-passphrase=$NewPsk;
:if ([ / caps-man interface print count-only where configuration=$Configuration ] > 0) do={
:foreach SeenSsid in=$Seen do={
:if ($SeenSsid = $Ssid) do={
- :log debug ("Already sent a mail for SSID " . $Ssid . ", skipping.");
+ $LogPrintExit debug ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
:set Skip 1;
}
}
diff --git a/daily-psk.local b/daily-psk.local
index 9950db8..3915618 100644
--- a/daily-psk.local
+++ b/daily-psk.local
@@ -7,9 +7,10 @@
#
# !! Do not edit this file, it is generated from template!
-:global Identity;
:global DailyPskMatchComment;
+:global Identity;
+:global LogPrintExit;
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
@@ -56,13 +57,13 @@
:local Skip 0;
:if ($NewPsk != $OldPsk) do={
- :log info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")");
+ $LogPrintExit info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
/ interface wireless access-list set $AccList private-pre-shared-key=$NewPsk;
:if ([ / interface wireless print count-only where name=$IntName disabled=no ] = 1) do={
:foreach SeenSsid in=$Seen do={
:if ($SeenSsid = $Ssid) do={
- :log debug ("Already sent a mail for SSID " . $Ssid . ", skipping.");
+ $LogPrintExit debug ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
:set Skip 1;
}
}
diff --git a/daily-psk.template b/daily-psk.template
index 88353a4..cab65f2 100644
--- a/daily-psk.template
+++ b/daily-psk.template
@@ -11,6 +11,7 @@
:global DailyPskMatchComment;
:global Identity;
+:global LogPrintExit;
:global SendNotification;
:global UrlEncode;
:global WaitForFile;
@@ -60,7 +61,7 @@
:local Skip 0;
:if ($NewPsk != $OldPsk) do={
- :log info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")");
+ $LogPrintExit info ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false;
/ interface wireless access-list set $AccList private-pre-shared-key=$NewPsk;
/ caps-man access-list set $AccList private-passphrase=$NewPsk;
@@ -68,7 +69,7 @@
:if ([ / caps-man interface print count-only where configuration=$Configuration ] > 0) do={
:foreach SeenSsid in=$Seen do={
:if ($SeenSsid = $Ssid) do={
- :log debug ("Already sent a mail for SSID " . $Ssid . ", skipping.");
+ $LogPrintExit debug ("Already sent a mail for SSID " . $Ssid . ", skipping.") false;
:set Skip 1;
}
}