Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion cmd/stackwhere/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ func (wc *webCmd) runE(cmd *cobra.Command, args []string) error {
return err
}

listener, err := net.Listen("tcp", *wc.flagAddr)
if err != nil {
return fmt.Errorf("web server failed: %w", err)
}
defer func() {
_ = listener.Close()
}()

if _, err := fmt.Fprintf(cmd.OutOrStdout(), "Serving stackwhere web UI on %s\n", startupURL(*wc.flagAddr)); err != nil {
return err
}
Expand All @@ -72,7 +80,7 @@ func (wc *webCmd) runE(cmd *cobra.Command, args []string) error {
Handler: app.handler(),
}

if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
if err := server.Serve(listener); err != nil && err != http.ErrServerClosed {
return fmt.Errorf("web server failed: %w", err)
}
return nil
Expand Down
24 changes: 24 additions & 0 deletions cmd/stackwhere/web_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bytes"
"net"
"net/http/httptest"
"os"
"path/filepath"
Expand Down Expand Up @@ -55,6 +56,29 @@ func TestWebCommandRequiresCollectionArg(t *testing.T) {
}
}

func TestWebCommandDoesNotAnnounceFailedBind(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatalf("failed to reserve test address: %v", err)
}
defer func() {
_ = listener.Close()
}()

cmd := root()
cmd.SetArgs([]string{"web", "../../testdata/basic.o", "--addr", listener.Addr().String()})

var stdout bytes.Buffer
cmd.SetOut(&stdout)

if err := cmd.Execute(); err == nil {
t.Fatal("expected web command to fail when address is already in use")
}
if got := stdout.String(); strings.Contains(got, "Serving stackwhere web UI") {
t.Fatalf("web command announced a server that failed to start: %q", got)
}
}

func TestWebHandlerServesLandingPage(t *testing.T) {
app, err := newWebApp("../../testdata/basic.o", nil)
if err != nil {
Expand Down