From 1a96a76ce2a4aa4f645dbb7fbfc55a905b714758 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 7 Jan 2024 11:23:19 -0600 Subject: cleanup Delete() logging output Signed-off-by: Jeff Carr --- delete.go | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) (limited to 'delete.go') diff --git a/delete.go b/delete.go index aa59105..157229f 100644 --- a/delete.go +++ b/delete.go @@ -8,57 +8,53 @@ package cloudflare import ( "os" - "go.wit.com/log" ) -func Delete(zone string, hostname string, value string) bool { - // CFdialog.emailNode.SetText(os.Getenv("CF_API_EMAIL")) - // CFdialog.apiNode.SetText(os.Getenv("CF_API_KEY")) - - log.Info("cloudflare.Delete() START", zone, hostname, value) +func Delete(zone string, hostname string, value string) (bool, string) { + log.Info(INFO, "Delete() START", zone, hostname, value) key := os.Getenv("CF_API_KEY") email := os.Getenv("CF_API_EMAIL") if (key == "") { - log.Warn("cloudflare.Delete() MISSING environment variable CF_API_KEY") - return false + log.Log(WARN, "Delete() MISSING environment variable CF_API_KEY") + return false, "" } if (email == "") { - log.Warn("cloudflare.Delete() MISSING environment variable CF_API_EMAIL") - return false + log.Log(WARN, "Delete() MISSING environment variable CF_API_EMAIL") + return false, "" } GetZones(key, email) var z *ConfigT for d, v := range Config { - log.Info("cloudflare.Delete() zone =", d, "value =", v) + log.Log(INFO, "Delete() zone =", d, "value =", v) if (zone == d) { z = Config[zone] - log.Info("cloudflare.Delete() FOUND ZONE", zone, "ID =", z.ZoneID) + log.Log(INFO, "Delete() FOUND ZONE", zone, "ID =", z.ZoneID) } } if (z == nil) { - log.Warn("cloudflare.Delete() COULD NOT FIND ZONE", zone) - return false + log.Log(WARN, "Delete() COULD NOT FIND ZONE", zone) + return false, "" } - log.Info("cloudflare.Delete() FOUND ZONE", z) + log.Log(INFO, "Delete() FOUND ZONE", z) records := GetZonefile(z) for i, record := range records.Result { if (record.Name == hostname) { - log.Info("cloudflare.Delete() FOUND hostname:", i, record.ID, record.Type, record.Name, record.Content) + log.Log(INFO, "Delete() FOUND hostname:", i, record.ID, record.Type, record.Name, record.Content) } if (record.Content == value) { - log.Info("cloudflare.Delete() FOUND CONTENT:", i, record.ID, record.Type, record.Name, record.Content) - log.Info("cloudflare.Delete() DO THE ACTUAL cloudflare DELETE here") + log.Log(INFO, "Delete() FOUND CONTENT:", i, record.ID, record.Type, record.Name, record.Content) + log.Log(INFO, "Delete() DO THE ACTUAL cloudflare DELETE here") result := doCurlDelete(key, email, z.ZoneID, record.ID) pretty, _ := FormatJSON(result) - log.Info("cloudflare.Delete() result =", pretty) - return true + log.Log(INFO, "Delete() result =", pretty) + return true, pretty } } - log.Info("cloudflare.Delete() NEVER FOUND cloudflare value:", value) - return false + log.Log(WARN, "Delete() NEVER FOUND cloudflare value:", value) + return false, "" } -- cgit v1.2.3