Skip to content
Open
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
3 changes: 2 additions & 1 deletion pkg/artifactcache/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func StartHandler(dir, customExternalURL string, outboundIP string, port uint16,

h.gcCache()

listener, err := net.Listen("tcp", fmt.Sprintf(":%d", port)) // listen on all interfaces
listener, err := net.Listen("tcp4", fmt.Sprintf(":%d", port)) // listen on all interfaces
if err != nil {
return nil, err
}
Expand All @@ -106,6 +106,7 @@ func StartHandler(dir, customExternalURL string, outboundIP string, port uint16,
Handler: router,
}
go func() {
logger.Infof("Start artifactcache server on http://0.0.0.0:%d", port)
if err := server.Serve(listener); err != nil && errors.Is(err, net.ErrClosed) {
logger.Errorf("http serve: %v", err)
}
Expand Down
11 changes: 8 additions & 3 deletions pkg/artifacts/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"io"
"io/fs"
"net"
"net/http"
"os"
"path/filepath"
Expand Down Expand Up @@ -291,16 +292,20 @@ func Serve(ctx context.Context, artifactPath string, addr string, port string) c
downloads(router, artifactPath, fsys)
RoutesV4(router, artifactPath, fsys, fsys)

listener, err := net.Listen("tcp4", fmt.Sprintf("%s:%s", addr, port))
if err != nil {
logger.Fatal(err)
}

server := &http.Server{
Addr: fmt.Sprintf("%s:%s", addr, port),
ReadHeaderTimeout: 2 * time.Second,
Handler: router,
}

// run server
go func() {
logger.Infof("Start server on http://%s:%s", addr, port)
if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
logger.Infof("Start artifact server on http://%s:%s", addr, port)
if err := server.Serve(listener); err != nil && err != http.ErrServerClosed {
logger.Fatal(err)
}
}()
Expand Down