Skip to content

Commit b1aa8f1

Browse files
committed
WIP: nick.farrell 02/10/25 12:00 fedora
1 parent f16bf2a commit b1aa8f1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

plugin/digitalocean.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"errors"
77
"fmt"
88
"io"
9+
"log/slog"
910
"os"
1011
"slices"
1112
"strconv"
@@ -257,7 +258,7 @@ func deleteOrphanedDroplets(ctx context.Context,
257258
}
258259

259260
if _, err := dropletsService.Delete(ctx, droplet.ID); err == nil {
260-
logger.Info("deleted orphaned droplet", "droplet ID", droplet.ID)
261+
logger.Info("deleted orphaned droplet", slog.Int("droplet ID", droplet.ID), slog.Duration("age", time.Since(dt)))
261262
} else {
262263
logger.Error("cannot delete droplet", "error", err, "droplet ID", droplet.ID)
263264
}
@@ -303,7 +304,7 @@ func (t *TargetPlugin) getReadyNomadClients(ctx context.Context) (DropletIDs, er
303304
continue
304305
}
305306

306-
// The summary daa returned by client.Nodes() does not contain sufficient metadaa to determine
307+
// The summary data returned by client.Nodes() does not contain sufficient metadaa to determine
307308
// the droplet ID; a follow-up call to `Info()` is required.
308309
node, _, err := client.Nodes().Info(node.ID, &q)
309310
if err != nil {
@@ -312,7 +313,8 @@ func (t *TargetPlugin) getReadyNomadClients(ctx context.Context) (DropletIDs, er
312313
}
313314
dropletID, ok := node.Attributes["unique.platform.digitalocean.id"]
314315
if !ok || dropletID == "" {
315-
t.logger.Warn("cannot find droplet ID", "NodeID", node.ID, "attributes", node.Attributes, "node", fmt.Sprintf("%+v", node), "err", err)
316+
// this is probably not a DO node; maybe running on AWS or GCP?
317+
t.logger.Debug("cannot find droplet ID", "NodeID", node.ID, "attributes", node.Attributes, "err", err)
316318
continue
317319
}
318320
t.logger.Debug("Found droplet ID for node", "NodeID", node.ID, "droplet ID", dropletID)

0 commit comments

Comments
 (0)