From 1cebf3b440a35d532b51a13f4b3dd1a90e8cdab2 Mon Sep 17 00:00:00 2001 From: Mitchell Riedstra Date: Mon, 26 Jul 2021 16:58:25 -0400 Subject: hack at it a bit to support checking for things that should not redirect --- cmd/main/main.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'cmd/main/main.go') diff --git a/cmd/main/main.go b/cmd/main/main.go index dd344d2..9210d44 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -30,6 +30,7 @@ type Config struct { CheckCerts map[string]*string `yaml:"CheckCerts"` ExpectedStatusCode int `yaml:"ExpectedStatusCode"` StatusChecks map[string]*int `yaml:"StatusChecks"` + StatusChecksNoRdr map[string]*int `yaml:"StatusChecksNoRedirect"` Workers int `yaml:"Workers"` Interval int `yaml:"Interval"` RenotifyInterval int `yaml:"RenotifyInterval"` @@ -172,21 +173,26 @@ func main() { if *once { jobNotify(conf, checkCerts(conf)) - jobNotify(conf, checkStatus(conf)) + jobNotify(conf, checkStatus(conf, conf.StatusChecks, checkup.HttpStatusOK)) + jobNotify(conf, checkStatus(conf, conf.StatusChecksNoRdr, checkup.HttpNoRedirectStatusOK)) os.Exit(0) } certsPrev := map[string]*jobResponse{} statusPrev := map[string]*jobResponse{} + statusPrevNoRdr := map[string]*jobResponse{} for { cert := checkCerts(conf) - status := checkStatus(conf) + status := checkStatus(conf, conf.StatusChecks, checkup.HttpStatusOK) + statusNoRdr := checkStatus(conf, conf.StatusChecksNoRdr, checkup.HttpNoRedirectStatusOK) jobNotifyDedup(conf, certsPrev, cert) jobNotifyDedup(conf, statusPrev, status) + jobNotifyDedup(conf, statusPrevNoRdr, statusNoRdr) certsPrev = cert statusPrev = status + statusPrevNoRdr = statusNoRdr time.Sleep(time.Duration(conf.Interval) * time.Second) } -- cgit v1.2.3