From 03eec1461952f94e924975469576331975095f19 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 25 Oct 2024 07:24:41 -0500 Subject: [PATCH] try writing out events Signed-off-by: Jeff Carr --- addDroplet.go | 6 ++++-- change.go | 1 + config.go | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/addDroplet.go b/addDroplet.go index aae0315..4216cb0 100644 --- a/addDroplet.go +++ b/addDroplet.go @@ -112,11 +112,13 @@ func updateDroplet(d *DropletT, domcfg *libvirtxml.Domain) error { // OS Type: &{Arch:x86_64 Machine:pc-i440fx-5.2 Type:hvm} t := domcfg.OS.Type if d.pb.QemuArch != t.Arch { - alle = append(alle, NewChangeEvent(d.pb, "Droplet.QemuArch", d.pb.QemuArch, t.Arch)) + e := NewChangeEvent(d.pb, "Droplet.QemuArch", d.pb.QemuArch, t.Arch) + alle = append(alle, e) d.pb.QemuArch = t.Arch } if d.pb.QemuMachine != t.Machine { - alle = append(alle, NewChangeEvent(d.pb, "Droplet.QemuMachine", d.pb.QemuMachine, t.Machine)) + e := NewChangeEvent(d.pb, "Droplet.QemuMachine", d.pb.QemuMachine, t.Machine) + alle = append(alle, e) d.pb.QemuMachine = t.Machine } } diff --git a/change.go b/change.go index 2c47fbb..669f55d 100644 --- a/change.go +++ b/change.go @@ -69,6 +69,7 @@ func NewChangeEvent(d *pb.Droplet, fname string, origval any, newval any) *pb.Ev e.Droplet = d.Hostname e.OrigVal = convertToString(origval) e.NewVal = convertToString(newval) + e.FieldName = fname // this also works, but it's a bit overkill // e.NewAny = convertToAnypb(newval) diff --git a/config.go b/config.go index cff7a6e..dbcbdf1 100644 --- a/config.go +++ b/config.go @@ -120,6 +120,22 @@ func writeConfigFile() { log.Println("config file write error") os.Exit(-1) } + + if me.events.WriteConfigJSON() { + os.Exit(-1) + } + if me.events.WriteConfigTEXT() { + os.Exit(-1) + } + + /* + if me.cluster.Droplets.WriteConfigJSON() { + os.Exit(-1) + } + if me.cluster.Droplets.WriteConfigTEXT() { + os.Exit(-1) + } + */ } func writeConfigFileTmp(filename string) bool {