Skip to content

fix: ensure coordinator debug output is always sorted #5867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2023
Merged

fix: ensure coordinator debug output is always sorted #5867

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a19b40f
fix: ensure coordinator debug output is always sorted
coadler Jan 26, 2023
63a425b
better formatting
coadler Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
better formatting
  • Loading branch information
@coadler
coadler committed Jan 26, 2023
commit 63a425b6f4df4b410afee3cbfa7a265c0ccdc6bb
12 changes: 6 additions & 6 deletions tailnet/coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ func (c *coordinator) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {
})

for _, agent := range agentSockets {
fmt.Fprintf(w, "<li><b>%s</b> (%s): created %v ago, write %v ago, overwrites %d </li>\n",
fmt.Fprintf(w, "<li style=\"margin-top:4px\"><b>%s</b> (<code>%s</code>): created %v ago, write %v ago, overwrites %d </li>\n",
agent.conn.name,
agent.id.String(),
now.Sub(time.Unix(agent.conn.start, 0)).Round(time.Second),
Expand All @@ -474,7 +474,7 @@ func (c *coordinator) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {
)

if conns := c.agentToConnectionSockets[agent.id]; len(conns) > 0 {
fmt.Fprintf(w, "<h3 style=\"margin:4px;font-size:16px;font-weight:400\">connections: total %d</h3>\n", len(conns))
fmt.Fprintf(w, "<h3 style=\"margin:0px;font-size:16px;font-weight:400\">connections: total %d</h3>\n", len(conns))

connSockets := make([]idConn, 0, len(conns))
for id, conn := range conns {
Expand All @@ -486,7 +486,7 @@ func (c *coordinator) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {

fmt.Fprintln(w, "<ul>")
for _, connSocket := range connSockets {
fmt.Fprintf(w, "<li><b>%s</b> (%s): created %v ago, write %v ago </li>\n",
fmt.Fprintf(w, "<li><b>%s</b> (<code>%s</code>): created %v ago, write %v ago </li>\n",
connSocket.conn.name,
connSocket.id.String(),
now.Sub(time.Unix(connSocket.conn.start, 0)).Round(time.Second),
Expand Down Expand Up @@ -532,14 +532,14 @@ func (c *coordinator) ServeHTTPDebug(w http.ResponseWriter, _ *http.Request) {
fmt.Fprintln(w, "<ul>")

for _, agentConns := range missingAgents {
fmt.Fprintf(w, "<li><b>unknown</b> (%s): created ? ago, write ? ago, overwrites ? </li>\n",
fmt.Fprintf(w, "<li style=\"margin-top:4px\"><b>unknown</b> (<code>%s</code>): created ? ago, write ? ago, overwrites ? </li>\n",
agentConns.id.String(),
)

fmt.Fprintf(w, "<h3 style=\"margin:4px;font-size:16px;font-weight:400\">connections: total %d</h3>\n", len(agentConns.conns))
fmt.Fprintf(w, "<h3 style=\"margin:0px;font-size:16px;font-weight:400\">connections: total %d</h3>\n", len(agentConns.conns))
fmt.Fprintln(w, "<ul>")
for _, agentConn := range agentConns.conns {
fmt.Fprintf(w, "<li><b>%s</b> (%s): created %v ago, write %v ago </li>\n",
fmt.Fprintf(w, "<li><b>%s</b> (<code>%s</code>): created %v ago, write %v ago </li>\n",
agentConn.conn.name,
agentConn.id.String(),
now.Sub(time.Unix(agentConn.conn.start, 0)).Round(time.Second),
Expand Down