From 6b7c94c5028be155032f79c1a51ce36db6efed0a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 9 Oct 2025 21:49:00 -0500 Subject: changes for new protobuf --- machine.go | 6 +++--- watchdog.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/machine.go b/machine.go index 669c927..8a3f754 100644 --- a/machine.go +++ b/machine.go @@ -110,8 +110,8 @@ func updateMachine(u *zoopb.Machine) string { if u.Packages == nil { u.Packages = new(zoopb.Packages) } - if zood := m.Packages.FindByPackage("zood"); zood != nil { - log.Log(INFO, m.Hostname, "has zood version", zood.Version) + if zood, err := m.Packages.FindByPackageName("zood"); zood != nil { + log.Log(INFO, m.Hostname, "has zood version", zood.Version, err) } m.Laststamp = timestamppb.New(time.Now()) @@ -151,7 +151,7 @@ func updatePackages(m *zoopb.Machine, newp *zoopb.Packages) bool { } func updatePackageVersion(m *zoopb.Machine, pnew *zoopb.Package) bool { - pold := m.Packages.FindByPackage(pnew.Package) + pold, _ := m.Packages.FindByPackageName(pnew.Package) if pold == nil { log.Log(NOW, "updatePackages() new package", pnew.Package, "version", pnew.Version, "machine", m.Hostname) m.Packages.Append(pnew) diff --git a/watchdog.go b/watchdog.go index cb3359d..fbbe6da 100644 --- a/watchdog.go +++ b/watchdog.go @@ -48,7 +48,7 @@ func NewWatchdog() { for loop.Scan() { m := loop.Next() counter += 1 - zood := m.Packages.FindByPackage("zood") + zood, _ := m.Packages.FindByPackageName("zood") if zood == nil { log.Info("machine", m.Hostname, "does not have zood installed") } else { -- cgit v1.2.3