start date works on events
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
4d43c36db5
commit
9b94785cd2
|
@ -5,8 +5,10 @@ import (
|
||||||
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
"google.golang.org/protobuf/types/known/anypb"
|
"google.golang.org/protobuf/types/known/anypb"
|
||||||
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
"google.golang.org/protobuf/types/known/wrapperspb"
|
"google.golang.org/protobuf/types/known/wrapperspb"
|
||||||
|
|
||||||
pb "go.wit.com/lib/protobuf/virtbuf"
|
pb "go.wit.com/lib/protobuf/virtbuf"
|
||||||
|
@ -71,6 +73,9 @@ func NewChangeEvent(d *pb.Droplet, fname string, origval any, newval any) *pb.Ev
|
||||||
e.NewVal = convertToString(newval)
|
e.NewVal = convertToString(newval)
|
||||||
e.FieldName = fname
|
e.FieldName = fname
|
||||||
|
|
||||||
|
now := time.Now()
|
||||||
|
e.Start = timestamppb.New(now)
|
||||||
|
|
||||||
// this also works, but it's a bit overkill
|
// this also works, but it's a bit overkill
|
||||||
// e.NewAny = convertToAnypb(newval)
|
// e.NewAny = convertToAnypb(newval)
|
||||||
|
|
||||||
|
|
21
config.go
21
config.go
|
@ -29,23 +29,24 @@ var ErrorParseXML error = errors.New("invalid xml")
|
||||||
|
|
||||||
// something is wrong somewhere and sometimes the
|
// something is wrong somewhere and sometimes the
|
||||||
// protobuf json files get written out with garbage
|
// protobuf json files get written out with garbage
|
||||||
func cfgfile() {
|
func cfgfile() error {
|
||||||
err := readConfigFile("virtigo.json")
|
err := readConfigFile("virtigo.json")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return
|
return err
|
||||||
}
|
|
||||||
if err == ErrorParseJSON {
|
|
||||||
os.Exit(-1)
|
|
||||||
}
|
}
|
||||||
|
// test last config also parses
|
||||||
err = readConfigFile("virtigo.json.last")
|
err = readConfigFile("virtigo.json.last")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
log.Info("read json failed", err)
|
return err
|
||||||
os.Exit(-1)
|
|
||||||
}
|
}
|
||||||
if err == ErrorNoFile {
|
|
||||||
log.Info("no config file created yet", err)
|
// try parsing event log
|
||||||
os.Exit(-1)
|
e, err := pb.ReadEventsConfig()
|
||||||
|
if err == nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
me.events = e
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func readConfigFile(filename string) error {
|
func readConfigFile(filename string) error {
|
||||||
|
|
6
main.go
6
main.go
|
@ -47,7 +47,11 @@ func main() {
|
||||||
me.events.Uuid = u.String()
|
me.events.Uuid = u.String()
|
||||||
me.events.Version = "dirty v1"
|
me.events.Version = "dirty v1"
|
||||||
|
|
||||||
cfgfile()
|
err := cfgfile()
|
||||||
|
if err != nil {
|
||||||
|
log.Warn("reading config file failed", err)
|
||||||
|
os.Exit(-1)
|
||||||
|
}
|
||||||
|
|
||||||
// sanity check the droplets
|
// sanity check the droplets
|
||||||
checkDroplets(false)
|
checkDroplets(false)
|
||||||
|
|
Loading…
Reference in New Issue