gui
/
cloudflare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup Delete() logging output 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-07 11:23:19 -06:00
parent 7116cab218
commit 1a96a76ce2
2 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
args.go
View File

@ -6,29 +6,25 @@ import (
"go.wit.com/log" "go.wit.com/log"
) )
var NOW log.LogFlag
var INFO log.LogFlag var INFO log.LogFlag
var WARN log.LogFlag
var CURL log.LogFlag var CURL log.LogFlag
var ZONE log.LogFlag var ZONE log.LogFlag
func init() { func myreg(f *log.LogFlag, b bool, name string, desc string) {
INFO.B = true f.B = b
INFO.Name = "INFO" f.Subsystem = "go.wit.com/gui/cloudflare"
INFO.Subsystem = "cloudflare" f.Short = "cfgui"
INFO.Short = "gui cf" f.Desc = desc
INFO.Desc = "general info" f.Name = name
INFO.Register() f.Register()
}
CURL.B = true
CURL.Name = "CURL" func init() {
CURL.Subsystem = "cloudflare" myreg(&NOW, true, "NOW", "temp debugging stuff")
CURL.Short = "gui cf" myreg(&INFO, false, "INFO", "general info")
CURL.Desc = "curl interactions()" myreg(&WARN, true, "WARN", "bad things")
CURL.Register() myreg(&CURL, true, "CURL", "curl interactions")
myreg(&ZONE, false, "ZONE", "zone details")
ZONE.B = true
ZONE.Name = "ZONE"
ZONE.Subsystem = "cloudflare"
ZONE.Short = "gui cf"
ZONE.Desc = "zone details"
ZONE.Register()
} }

40
delete.go
View File

@ -8,57 +8,53 @@ package cloudflare
import ( import (
"os" "os"
"go.wit.com/log" "go.wit.com/log"
) )
func Delete(zone string, hostname string, value string) bool { func Delete(zone string, hostname string, value string) (bool, string) {
// CFdialog.emailNode.SetText(os.Getenv("CF_API_EMAIL")) log.Info(INFO, "Delete() START", zone, hostname, value)
// CFdialog.apiNode.SetText(os.Getenv("CF_API_KEY"))
log.Info("cloudflare.Delete() START", zone, hostname, value)
key := os.Getenv("CF_API_KEY") key := os.Getenv("CF_API_KEY")
email := os.Getenv("CF_API_EMAIL") email := os.Getenv("CF_API_EMAIL")
if (key == "") { if (key == "") {
log.Warn("cloudflare.Delete() MISSING environment variable CF_API_KEY") log.Log(WARN, "Delete() MISSING environment variable CF_API_KEY")
return false return false, ""
} }
if (email == "") { if (email == "") {
log.Warn("cloudflare.Delete() MISSING environment variable CF_API_EMAIL") log.Log(WARN, "Delete() MISSING environment variable CF_API_EMAIL")
return false return false, ""
} }
GetZones(key, email) GetZones(key, email)
var z *ConfigT var z *ConfigT
for d, v := range Config { for d, v := range Config {
log.Info("cloudflare.Delete() zone =", d, "value =", v) log.Log(INFO, "Delete() zone =", d, "value =", v)
if (zone == d) { if (zone == d) {
z = Config[zone] 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) { if (z == nil) {
log.Warn("cloudflare.Delete() COULD NOT FIND ZONE", zone) log.Log(WARN, "Delete() COULD NOT FIND ZONE", zone)
return false return false, ""
} }
log.Info("cloudflare.Delete() FOUND ZONE", z) log.Log(INFO, "Delete() FOUND ZONE", z)
records := GetZonefile(z) records := GetZonefile(z)
for i, record := range records.Result { for i, record := range records.Result {
if (record.Name == hostname) { 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) { if (record.Content == value) {
log.Info("cloudflare.Delete() FOUND CONTENT:", i, record.ID, record.Type, record.Name, record.Content) log.Log(INFO, "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() DO THE ACTUAL cloudflare DELETE here")
result := doCurlDelete(key, email, z.ZoneID, record.ID) result := doCurlDelete(key, email, z.ZoneID, record.ID)
pretty, _ := FormatJSON(result) pretty, _ := FormatJSON(result)
log.Info("cloudflare.Delete() result =", pretty) log.Log(INFO, "Delete() result =", pretty)
return true return true, pretty
} }
} }
log.Info("cloudflare.Delete() NEVER FOUND cloudflare value:", value) log.Log(WARN, "Delete() NEVER FOUND cloudflare value:", value)
return false return false, ""
} }