Display remote address only, enable port with -p flag

Also add "conn" and "conns" as aliases

Author: iBug

cmd/cmd.go

@@ -30,18 +30,21 @@ func ServerCmd() *cobra.Command {
 
 func ConnectionsCmd() *cobra.Command {
 	c := &cobra.Command{
-		Use:   "connections",
-		Short: "Show active connections",
-		Args:  cobra.NoArgs,
+		Use:     "connections",
+		Aliases: []string{"conn", "conns"},
+		Short:   "Show active connections",
+		Args:    cobra.NoArgs,
 	}
+	var withPort bool
 	config := server.DefaultConfig()
 	config.InstallAdminFlags(c.Flags())
+	c.Flags().BoolVarP(&withPort, "port", "p", false, "Show remote port in output")
 	c.RunE = func(cmd *cobra.Command, _ []string) error {
 		infos, err := server.QueryConnections(config)
 		if err != nil {
 			return fmt.Errorf("query connections: %w", err)
 		}
-		return server.PrintConnections(os.Stdout, infos)
+		return server.PrintConnections(os.Stdout, infos, withPort)
 	}
 	return c
 }

pkg/server/server.go

@@ -361,7 +361,7 @@ func QueryConnections(config Config) ([]ConnectionInfo, error) {
 	return infos, nil
 }
 
-func PrintConnections(w io.Writer, infos []ConnectionInfo) error {
+func PrintConnections(w io.Writer, infos []ConnectionInfo, withPort bool) error {
 	table := tablewriter.NewTable(
 		w,
 		tablewriter.WithRendition(tw.Rendition{
@@ -386,13 +386,21 @@ func PrintConnections(w io.Writer, infos []ConnectionInfo) error {
 	)
 	table.Header("Index", "Remote", "Path", "Status", "Connected")
 	for _, info := range infos {
+		remote := info.RemoteAddr
+		if remote == "" {
+			remote = UnknownFallback
+		}
+		if withPort {
+			remote = assembleRemote(info.RemoteAddr, info.RemotePort)
+		}
+
 		status := "Active"
 		if info.QueuePos > 0 {
 			status = fmt.Sprintf("Queued (%d)", info.QueuePos)
 		}
 		if err := table.Append([]string{
 			strconv.FormatUint(info.Index, 10),
-			assembleRemote(info.RemoteAddr, info.RemotePort),
+			remote,
 			strings.TrimSuffix(info.Path, "/git-upload-pack"),
 			status,
 			info.Connected.Format(time.DateTime),

pkg/server/server_test.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"bytes"
+	"strings"
 	"testing"
 	"time"
 
@@ -27,3 +29,34 @@ func TestFormatTelegrafLine(t *testing.T) {
 	line := formatTelegrafLine("host name,prod=1", 10, 15, time.Unix(0, 1778837100123456789))
 	assert.Equal(t, "git-queue,host=host\\ name\\,prod\\=1 active=10i,queued=15i 1778837100123456789\n", line)
 }
+
+func TestPrintConnections_DefaultRemoteWithoutPort(t *testing.T) {
+	var b bytes.Buffer
+	err := PrintConnections(&b, []ConnectionInfo{{
+		Index:      1,
+		RemoteAddr: "192.0.2.12",
+		RemotePort: "443",
+		Path:       "/repo.git/git-upload-pack",
+		Connected:  time.Date(2026, 5, 16, 12, 0, 0, 0, time.UTC),
+	}}, false)
+	require.NoError(t, err)
+
+	out := b.String()
+	assert.Contains(t, out, "192.0.2.12")
+	assert.NotContains(t, out, "192.0.2.12:443")
+}
+
+func TestPrintConnections_WithPort(t *testing.T) {
+	var b bytes.Buffer
+	err := PrintConnections(&b, []ConnectionInfo{{
+		Index:      1,
+		RemoteAddr: "192.0.2.12",
+		RemotePort: "443",
+		Path:       "/repo.git/git-upload-pack",
+		Connected:  time.Date(2026, 5, 16, 12, 0, 0, 0, time.UTC),
+	}}, true)
+	require.NoError(t, err)
+
+	out := b.String()
+	assert.True(t, strings.Contains(out, "192.0.2.12:443") || strings.Contains(out, "[192.0.2.12]:443"))
+}