myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

nodes list: expose expiration time

Browse source
This commit is contained in:
Even Holthe 2023-01-11 13:35:47 +01:00 committed by Juan Font
parent dd173ecc1f
commit e27e01c09f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/headscale/cli/nodes.go
View file

@ -475,6 +475,7 @@ func nodesToPtables(
"IP addresses", "IP addresses",
"Ephemeral", "Ephemeral",
"Last seen", "Last seen",
"Expiration",
"Online", "Online",
"Expired", "Expired",
} }
@ -501,8 +502,12 @@ func nodesToPtables(
} }
var expiry time.Time var expiry time.Time
var expiryTime string
if machine.Expiry != nil { if machine.Expiry != nil {
expiry = machine.Expiry.AsTime() expiry = machine.Expiry.AsTime()
expiryTime = expiry.Format("2006-01-02 15:04:05")
} else {
expiryTime = "N/A"
} }
var machineKey key.MachinePublic var machineKey key.MachinePublic
@ -583,6 +588,7 @@ func nodesToPtables(
strings.Join([]string{IPV4Address, IPV6Address}, ", "), strings.Join([]string{IPV4Address, IPV6Address}, ", "),
strconv.FormatBool(ephemeral), strconv.FormatBool(ephemeral),
lastSeenTime, lastSeenTime,
expiryTime,
online, online,
expired, expired,
} }