global-functions: drop $MailServerIsUp

Now that we have an e-mail queue we do not care if the server is up or not.
This commit is contained in:
Christian Hesse 2021-02-16 16:13:41 +01:00
parent 28db473299
commit efca1ec049
3 changed files with 0 additions and 57 deletions

View file

@ -32,7 +32,6 @@
:global IfThenElse;
:global IPCalc;
:global LogPrintExit;
:global MailServerIsUp;
:global MkDir;
:global ParseKeyValueStore;
:global RandomDelay;
@ -486,52 +485,6 @@
}
}
# check if mail server is up
:set MailServerIsUp do={
:local MailServer [ / tool e-mail get address ];
:global EmailGeneralTo;
:global LogPrintExit;
:if ([ :len $EmailGeneralTo ] = 0) do={
:return true;
} else={
:if ($MailServer = "0.0.0.0") do={
$LogPrintExit info ("No mail server is configured! Returning gracefully...") false;
:return true;
}
}
:if ([ :len [ / tool netwatch find where comment=$MailServer ] ] = 0) do={
$LogPrintExit info ("Adding netwatch entry for mail server.") false;
:local MailHost $MailServer;
:if ([ :typeof [ :toip $MailHost ] ] != "ip" ) do={
:do {
:set MailHost [ :resolve $MailServer ];
} on-error={
$LogPrintExit warning ("Resolving mail server failed.") false;
:return false;
}
}
/ tool netwatch add comment=$MailServer host=$MailHost;
}
:local NetWatch [ / tool netwatch find where comment=$MailServer ];
:local NetWatchVal [ / tool netwatch get $NetWatch ];
:if ($NetWatchVal->"status" = "up") do={
:return true;
}
/ tool netwatch set interval=($NetWatchVal->"interval") $NetWatch;
:delay ($NetWatchVal->"timeout");
:if ([ / tool netwatch get $NetWatch status ] = "up") do={
:return true;
}
:return false;
}
# create directory
:set MkDir do={
:local Dir [ :tostr $1 ];

View file

@ -14,7 +14,6 @@
:global IfThenElse;
:global LogPrintExit;
:global MailServerIsUp;
:global ScriptLock;
:global SendNotification;
:global SymbolForNotification;
@ -33,10 +32,6 @@ $ScriptLock "log-forward";
$WaitFullyConnected;
:if ([ $MailServerIsUp ] = false) do={
$LogPrintExit warning ("Mail server is not up.") true;
}
:local Count 0;
:local Messages "";
:local MessageVal;

View file

@ -10,7 +10,6 @@
:global IfThenElse;
:global LogPrintExit;
:global MailServerIsUp;
:global ScriptLock;
:global SendNotification;
:global SymbolForNotification;
@ -24,10 +23,6 @@ $ScriptLock "sms-forward";
$WaitFullyConnected;
:if ([ $MailServerIsUp ] = false) do={
$LogPrintExit warning "Mail server is not up." true;
}
:local Settings [ / tool sms get ];
# forward SMS in a loop