Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

global-functions: rename internal function: $TimeIsSync -> $IsTimeSync

Browse source
This commit is contained in:
Christian Hesse 2022-06-17 00:23:00 +02:00
parent 9aa82316c8
commit b1ad89b1b5
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
global-functions
View file

@ -34,6 +34,7 @@
:global IfThenElse;
:global IsDefaultRouteReachable;
:global IsDNSResolving;
:global IsTimeSync;
:global LogPrintExit2;
:global MkDir;
:global NotificationFunctions;
@ -51,7 +52,6 @@
:global SendNotification2;
:global SymbolByUnicodeName;
:global SymbolForNotification;
:global TimeIsSync;
:global UrlEncode;
:global ValidateSyntax;
:global VersionToNum;
@ -323,13 +323,13 @@
:global EmailQueue;
:global EitherOr;
:global IsTimeSync;
:global LogPrintExit2;
:global TimeIsSync;
:local AllDone true;
:local QueueLen [ :len $EmailQueue ];
:if ([ $TimeIsSync ] = false) do={
:if ([ $IsTimeSync ] = false) do={
$LogPrintExit2 debug $0 ("Time is not synced, not flushing.") false;
:return false;
}
@ -462,6 +462,34 @@
:return true;
}
# check if system time is sync
:set IsTimeSync do={
:global LogPrintExit2;
:if ([ /system/ntp/client/get enabled ] = true) do={
:do {
:if ([ /system/ntp/client/get status ] = "synchronized") do={
:return true;
}
} on-error={
:if ([ :typeof [ /system/ntp/client/get last-adjustment ] ] = "time") do={
:return true;
}
}
:return false;
}
:if ([ /ip/cloud/get ddns-enabled ] = true && [ /ip/cloud/get update-time ] = true) do={
:if ([ :typeof [ /ip/cloud/get public-address ] ] = "ip") do={
:return true;
}
:return false;
}
$LogPrintExit2 debug $0 ("No time source configured! Returning gracefully...") false;
:return true;
}
# log and print with same text, optionally exit
:set LogPrintExit2 do={
:local Severity [ :tostr $1 ];
@ -1110,34 +1138,6 @@
:return ($Return . " ");
}
# check if system time is sync
:set TimeIsSync do={
:global LogPrintExit2;
:if ([ /system/ntp/client/get enabled ] = true) do={
:do {
:if ([ /system/ntp/client/get status ] = "synchronized") do={
:return true;
}
} on-error={
:if ([ :typeof [ /system/ntp/client/get last-adjustment ] ] = "time") do={
:return true;
}
}
:return false;
}
:if ([ /ip/cloud/get ddns-enabled ] = true && [ /ip/cloud/get update-time ] = true) do={
:if ([ :typeof [ /ip/cloud/get public-address ] ] = "ip") do={
:return true;
}
:return false;
}
$LogPrintExit2 debug $0 ("No time source configured! Returning gracefully...") false;
:return true;
}
# url encoding
:set UrlEncode do={
:local Input [ :tostr $1 ];
@ -1256,9 +1256,9 @@
# wait for time to become synced
:set WaitTimeSync do={
:global TimeIsSync;
:global IsTimeSync;
:while ([ $TimeIsSync ] = false) do={
:while ([ $IsTimeSync ] = false) do={
:delay 1s;
}
}