check-certificates: use $LogAndPut

This commit is contained in:
Christian Hesse 2020-02-26 12:55:38 +01:00
parent b70a460f43
commit 3cd9b9ead5

View file

@ -15,6 +15,7 @@
:global UrlEncode;
:global WaitForFile;
:global LogAndError;
:global LogAndPut;
:local FormatExpire do={
:global CharacterReplace;
@ -85,7 +86,7 @@
"Issuer: " . ([ $ParseKeyValueStore ($CertNewVal->"issuer") ]->"CN") . "\n" . \
"Validity: " . ($CertNewVal->"invalid-before") . " to " . ($CertNewVal->"invalid-after") . "\n" . \
"Expires in: " . [ $FormatExpire ($CertNewVal->"expires-after") ]) "" "true";
:log info ("The certificate " . ($CertVal->"name") . " has been renewed.");
$LogAndPut info ("The certificate " . ($CertVal->"name") . " has been renewed.");
} on-error={
:log debug ("Could not renew certificate " . ($CertVal->"name") . ".");
}
@ -109,6 +110,6 @@
"Issuer: " . ($CertVal->"ca") . ([ $ParseKeyValueStore ($CertVal->"issuer") ]->"CN") . "\n" . \
"Validity: " . ($CertVal->"invalid-before") . " to " . ($CertVal->"invalid-after") . "\n" . \
"Expires in: " . $ExpiresAfter);
:log warning ("The certificate " . ($CertVal->"name") . " " . $State . \
$LogAndPut warning ("The certificate " . ($CertVal->"name") . " " . $State . \
", it is invalid after " . ($CertVal->"invalid-after") . ".");
}