From cb1a931b4c0d165fbf539481c5e11b78770f66bb Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Sun, 4 Feb 2024 00:08:43 +0100 Subject: [PATCH] hopefully fix time comparison --- cmd/woodpecker-autoscaler.go | 6 +++--- internal/hetzner/hetzneragent.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/woodpecker-autoscaler.go b/cmd/woodpecker-autoscaler.go index 22bc38e..680b942 100644 --- a/cmd/woodpecker-autoscaler.go +++ b/cmd/woodpecker-autoscaler.go @@ -85,13 +85,13 @@ func Decom(cfg *config.Config, ownedNodes []hcloud.Server) { } log.WithFields(log.Fields{ "Caller": "Decom", - }).Debugf("Node %s is running for %f", server.Name, runtime.Minutes()) + }).Debugf("Node %s is running for %d", server.Name, runtime.Minute()) // Check if next check if sooner than the 60 Minute mark of the next hetzner check // https://docs.hetzner.com/cloud/billing/faq/#how-do-you-bill-your-servers - if (runtime + time.Duration(cfg.CheckInterval)*time.Minute) < 60 { + if time.Duration(runtime.Add(time.Duration(cfg.CheckInterval)*time.Minute).Minute()) < (60 * time.Minute) { log.WithFields(log.Fields{ "Caller": "Decom", - }).Infof("Skipping node termination of %s (running for %f Minutes) in Cost Optimized Mode", server.Name, runtime.Minutes()) + }).Infof("Skipping node termination of %s (running for %d Minutes) in Cost Optimized Mode", server.Name, runtime.Minute()) continue } } diff --git a/internal/hetzner/hetzneragent.go b/internal/hetzner/hetzneragent.go index 31365c6..2d9ee0c 100644 --- a/internal/hetzner/hetzneragent.go +++ b/internal/hetzner/hetzneragent.go @@ -175,11 +175,11 @@ func RefreshNodeInfo(cfg *config.Config, serverID int) (*hcloud.Server, error) { return server, nil } -func CheckRuntime(cfg *config.Config, server *hcloud.Server) (time.Duration, error) { +func CheckRuntime(cfg *config.Config, server *hcloud.Server) (time.Time, error) { server, err := RefreshNodeInfo(cfg, server.ID) now := time.Now() if err != nil { - return time.Duration(0), errors.New(fmt.Sprintf("Could not check Runtime: %s", err.Error())) + return time.Time{}, errors.New(fmt.Sprintf("Could not check Runtime: %s", err.Error())) } - return server.Created.Sub(now), nil + return server.Created.Add(time.Duration(now.Minute())), nil }