hotspot-to-wpa-cleanup: switch to $LogPrint

3 files changed, 21 insertions, 21 deletions

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index ba74260..0540ad5 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -18,7 +18,7 @@
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
-  :global LogPrintExit2;
+  :global LogPrint;
   :global ParseKeyValueStore;
   :global ScriptLock;
 
@@ -41,8 +41,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic \
         mac-address=($ClientVal->"mac-address") ] do={
       :if (($DHCPServers->[ /ip/dhcp-server/lease/get $Lease server ]) > 0s) do={
-        $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-          " connected to WPA, making lease static.") false;
+        $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+          " connected to WPA, making lease static.");
         /ip/dhcp-server/lease/make-static $Lease;
         /ip/dhcp-server/lease/set comment=($ClientVal->"comment") $Lease;
       }
@@ -54,8 +54,8 @@
     :local ClientVal [ /caps-man/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
          mac-address=($ClientVal->"mac-address") ] ] = 0) do={
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-        " did not connect to WPA, removing from access list.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+        " did not connect to WPA, removing from access list.");
       /caps-man/access-list/remove $Client;
     }
   }
@@ -64,8 +64,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where !dynamic status="waiting" \
         server=$Server last-seen>$Timeout comment~"^hotspot-to-wpa:" ] do={
       :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
-        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
+        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.");
       /caps-man/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
         mac-address=($LeaseVal->"mac-address") ];
       /ip/dhcp-server/lease/remove $Lease;
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index c46d75d..6f3b3e1 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -19,7 +19,7 @@
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
-  :global LogPrintExit2;
+  :global LogPrint;
   :global ParseKeyValueStore;
   :global ScriptLock;
 
@@ -44,8 +44,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic \
         mac-address=($ClientVal->"mac-address") ] do={
       :if (($DHCPServers->[ /ip/dhcp-server/lease/get $Lease server ]) > 0s) do={
-        $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-          " connected to WPA, making lease static.") false;
+        $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+          " connected to WPA, making lease static.");
         /ip/dhcp-server/lease/make-static $Lease;
         /ip/dhcp-server/lease/set comment=($ClientVal->"comment") $Lease;
       }
@@ -59,8 +59,8 @@
     :local ClientVal [ /interface/wifi/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
          mac-address=($ClientVal->"mac-address") ] ] = 0) do={
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-        " did not connect to WPA, removing from access list.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+        " did not connect to WPA, removing from access list.");
       /caps-man/access-list/remove $Client;
       /interface/wifi/access-list/remove $Client;
     }
@@ -70,8 +70,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where !dynamic status="waiting" \
         server=$Server last-seen>$Timeout comment~"^hotspot-to-wpa:" ] do={
       :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
-        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
+        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.");
       /caps-man/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
       /interface/wifi/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
         mac-address=($LeaseVal->"mac-address") ];
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 3e5799a..9c79628 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -18,7 +18,7 @@
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
-  :global LogPrintExit2;
+  :global LogPrint;
   :global ParseKeyValueStore;
   :global ScriptLock;
 
@@ -41,8 +41,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic \
         mac-address=($ClientVal->"mac-address") ] do={
       :if (($DHCPServers->[ /ip/dhcp-server/lease/get $Lease server ]) > 0s) do={
-        $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-          " connected to WPA, making lease static.") false;
+        $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+          " connected to WPA, making lease static.");
         /ip/dhcp-server/lease/make-static $Lease;
         /ip/dhcp-server/lease/set comment=($ClientVal->"comment") $Lease;
       }
@@ -54,8 +54,8 @@
     :local ClientVal [ /interface/wifi/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
          mac-address=($ClientVal->"mac-address") ] ] = 0) do={
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
-        " did not connect to WPA, removing from access list.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+        " did not connect to WPA, removing from access list.");
       /interface/wifi/access-list/remove $Client;
     }
   }
@@ -64,8 +64,8 @@
     :foreach Lease in=[ /ip/dhcp-server/lease/find where !dynamic status="waiting" \
         server=$Server last-seen>$Timeout comment~"^hotspot-to-wpa:" ] do={
       :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];
-      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
-        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
+      $LogPrint info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
+        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.");
       /interface/wifi/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
         mac-address=($LeaseVal->"mac-address") ];
       /ip/dhcp-server/lease/remove $Lease;