Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

Add expired column to machine list command

Browse Source
This commit is contained in:
Kristoffer Dalby 2021-11-21 09:44:38 +00:00
parent 6a9dd2029e
commit 1c7aff5dd9
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/headscale/cli/nodes.go
View File

@ -412,6 +412,7 @@ func nodesToPtables(
"Ephemeral",
"Last seen",
"Online",
"Expired",
},
}
@ -420,12 +421,19 @@ func nodesToPtables(
if machine.PreAuthKey != nil && machine.PreAuthKey.Ephemeral {
ephemeral = true
}
var lastSeen time.Time
var lastSeenTime string
if machine.LastSeen != nil {
lastSeen = machine.LastSeen.AsTime()
lastSeenTime = lastSeen.Format("2006-01-02 15:04:05")
}
var expiry time.Time
if machine.Expiry != nil {
expiry = machine.Expiry.AsTime()
}
nKey, err := wgkey.ParseHex(machine.NodeKey)
if err != nil {
return nil, err
@ -436,9 +444,21 @@ func nodesToPtables(
if lastSeen.After(
time.Now().Add(-5 * time.Minute),
) { // TODO: Find a better way to reliably show if online
online = pterm.LightGreen("true")
online = pterm.LightGreen("online")
} else {
online = pterm.LightRed("false")
online = pterm.LightRed("offline")
}
fmt.Printf(
"Machine %s, expiry: %s\n",
machine.Name,
expiry.Format("2006-01-02 15:04:05"),
)
var expired string
if expiry.IsZero() || expiry.After(time.Now()) {
expired = pterm.LightGreen("no")
} else {
expired = pterm.LightRed("yes")
}
var namespace string
@ -459,6 +479,7 @@ func nodesToPtables(
strconv.FormatBool(ephemeral),
lastSeenTime,
online,
expired,
},
)
}