diff --git a/args.go b/args.go index 574de06..04dafca 100644 --- a/args.go +++ b/args.go @@ -6,29 +6,25 @@ import ( "go.wit.com/log" ) +var NOW log.LogFlag var INFO log.LogFlag +var WARN log.LogFlag var CURL log.LogFlag var ZONE log.LogFlag -func init() { - INFO.B = true - INFO.Name = "INFO" - INFO.Subsystem = "cloudflare" - INFO.Short = "gui cf" - INFO.Desc = "general info" - INFO.Register() - - CURL.B = true - CURL.Name = "CURL" - CURL.Subsystem = "cloudflare" - CURL.Short = "gui cf" - CURL.Desc = "curl interactions()" - CURL.Register() - - ZONE.B = true - ZONE.Name = "ZONE" - ZONE.Subsystem = "cloudflare" - ZONE.Short = "gui cf" - ZONE.Desc = "zone details" - ZONE.Register() +func myreg(f *log.LogFlag, b bool, name string, desc string) { + f.B = b + f.Subsystem = "go.wit.com/gui/cloudflare" + f.Short = "cfgui" + f.Desc = desc + f.Name = name + f.Register() +} + +func init() { + myreg(&NOW, true, "NOW", "temp debugging stuff") + myreg(&INFO, false, "INFO", "general info") + myreg(&WARN, true, "WARN", "bad things") + myreg(&CURL, true, "CURL", "curl interactions") + myreg(&ZONE, false, "ZONE", "zone details") } 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, "" }