From a3e3cde4c4f9eb7664b331fce54bbd9cfd5f875c Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 22 Aug 2023 02:54:35 +0000 Subject: [PATCH] zones: fix scanMachines to run after all zones have been read Signed-off-by: Alejandro Mery --- pkg/zones/scan.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/zones/scan.go b/pkg/zones/scan.go index 3db55e0..01b309f 100644 --- a/pkg/zones/scan.go +++ b/pkg/zones/scan.go @@ -26,7 +26,17 @@ func (m *Zones) scan() error { } } - return nil + return m.scanMachines() +} + +func (m *Zones) scanMachines() error { + var err error + m.ForEachMachine(func(p *Machine) { + if err == nil { + err = p.scan() + } + }) + return err } func (z *Zone) scan() error { @@ -47,15 +57,5 @@ func (z *Zone) scan() error { } } - return z.scanMachines() -} - -func (z *Zone) scanMachines() error { - var err error - z.zones.ForEachMachine(func(m *Machine) { - if err == nil { - err = m.scan() - } - }) - return err + return nil }