Skip to content

Commit

Permalink
fix nexus tag and enable short levels (#257)
Browse files Browse the repository at this point in the history
  • Loading branch information
jordan-rash committed Jun 6, 2024
1 parent 69da829 commit 69d246b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
7 changes: 4 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/cdfmlr/ellipsis v0.0.1
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbletea v0.25.0
github.com/charmbracelet/lipgloss v0.10.0
github.com/charmbracelet/lipgloss v0.11.0
github.com/choria-io/fisk v0.6.2
github.com/cloudevents/sdk-go v1.2.0
github.com/docker/docker v26.0.2+incompatible
Expand All @@ -16,7 +16,7 @@ require (
github.com/google/uuid v1.6.0
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf
github.com/jedib0t/go-pretty/v6 v6.5.8
github.com/jordan-rash/slog-handler v0.0.0-20240514154657-1f72d9d2d911
github.com/jordan-rash/slog-handler v0.0.0-20240523140048-9e8ba2d5eb3d
github.com/nats-io/jsm.go v0.1.1
github.com/nats-io/jwt/v2 v2.5.6
github.com/nats-io/nats-server/v2 v2.10.14
Expand All @@ -42,7 +42,7 @@ require (
go.opentelemetry.io/otel/sdk v1.26.0
go.opentelemetry.io/otel/sdk/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
golang.org/x/sys v0.20.0
golang.org/x/sys v0.21.0
golang.org/x/term v0.19.0
google.golang.org/grpc v1.63.2
rogchap.com/v8go v0.9.0
Expand All @@ -60,6 +60,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/x/ansi v0.1.2 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt
github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g=
github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
github.com/choria-io/fisk v0.6.2 h1:Vfvpcv8SD53FHW5cT4u7LStpz/wThwRPQHU7mzv1kMI=
github.com/choria-io/fisk v0.6.2/go.mod h1:PajiUZTAotE5zO18eU6UexuPLLv565WOma4dB0ObxRM=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down Expand Up @@ -197,6 +201,8 @@ github.com/jordan-rash/firecracker-go-sdk v0.0.0-20240422123121-239cc054eb0a h1:
github.com/jordan-rash/firecracker-go-sdk v0.0.0-20240422123121-239cc054eb0a/go.mod h1:bZQpQss4wFMwC7vku5/hQc1IpG+IemXqzNPUB/h8LdA=
github.com/jordan-rash/slog-handler v0.0.0-20240514154657-1f72d9d2d911 h1:CoPeVFn7XpyZz5O5YLd1wmJ8PG7NPK/9CJSyKILMvEY=
github.com/jordan-rash/slog-handler v0.0.0-20240514154657-1f72d9d2d911/go.mod h1:ZXgFXP35hKZTDjbTUFow7epfEoCkazXwe/mQBqAHaX0=
github.com/jordan-rash/slog-handler v0.0.0-20240523140048-9e8ba2d5eb3d h1:i12gg9VzMKQRjdZBhLmZFrVO86Pshokp3XOVqa51CIE=
github.com/jordan-rash/slog-handler v0.0.0-20240523140048-9e8ba2d5eb3d/go.mod h1:ZXgFXP35hKZTDjbTUFow7epfEoCkazXwe/mQBqAHaX0=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
Expand Down Expand Up @@ -485,6 +491,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down
2 changes: 2 additions & 0 deletions nex/nex.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ func main() {
handlerOpts = append(handlerOpts, shandler.WithColor())
}

handlerOpts = append(handlerOpts, shandler.WithShortLevels())

logger := slog.New(shandler.NewHandler(handlerOpts...))
keypair, err := nkeys.CreateServer()
if err != nil {
Expand Down
7 changes: 6 additions & 1 deletion nex/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,13 @@ func renderNodeList(nodes []controlapi.PingResponse, listFull bool) {
nodeArch = "unknown"
}

nodeNexus, ok := node.Tags["nexus"]
if !ok {
nodeNexus = ""
}

row = append(row, node.Uptime, !nUnsafe, nodeOS, nodeArch)
row = append([]any{node.Nexus}, row...)
row = append([]any{nodeNexus}, row...)
}

tbl.AddRow(row...)
Expand Down

0 comments on commit 69d246b

Please sign in to comment.