Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Dec 4, 2023
1 parent 8cf8c7c commit 4933116
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Expand Up @@ -32,6 +32,7 @@ jobs:
strategy:
matrix:
go: [ '1.20', '1.21' ]
fail-fast: false

name: Test
runs-on: ubuntu-latest
Expand Down
8 changes: 7 additions & 1 deletion handler.go
Expand Up @@ -256,7 +256,13 @@ func (h *Hub) chainHandlers() http.Handler { //nolint:funlen
}

secureHandler := secureMiddleware.Handler(useForwardedHeadersHandlers)
loggingHandler := handlers.CombinedLoggingHandler(os.Stderr, secureHandler)

var loggingHandler http.Handler
if h.logger != nil && h.logger.Level().Enabled(zap.FatalLevel) {
loggingHandler = handlers.CombinedLoggingHandler(os.Stderr, secureHandler)
} else {
loggingHandler = secureHandler
}
recoveryHandler := handlers.RecoveryHandler(
handlers.RecoveryLogger(zapRecoveryHandlerLogger{h.logger}),
handlers.PrintRecoveryStack(h.debug),
Expand Down
18 changes: 11 additions & 7 deletions server_test.go
Expand Up @@ -223,20 +223,24 @@ func TestServe(t *testing.T) {

func TestClientClosesThenReconnects(t *testing.T) {
l := zap.NewNop()
u, _ := url.Parse("bolt://test.db")
bt, _ := NewTransport(u, l)
u, err := url.Parse("bolt://test.db")
require.NoError(t, err)

bt, err := NewTransport(u, l)
require.NoError(t, err)
defer os.Remove("test.db")

h := createAnonymousDummy(WithLogger(l), WithTransport(bt))
transport := h.transport.(*BoltTransport)
defer os.Remove("test.db")
go h.Serve()

// loop until the web server is ready
var resp *http.Response
client := http.Client{Timeout: 10 * time.Second}
for resp == nil {
resp, _ = client.Get(testURLscheme + testAddr + "/") //nolint:bodyclose
resp, _ = client.Get(testURLscheme + testAddr) //nolint:bodyclose
}
resp.Body.Close()
require.NoError(t, resp.Body.Close())

var wg sync.WaitGroup

Expand All @@ -263,7 +267,7 @@ func TestClientClosesThenReconnects(t *testing.T) {
}
}

resp.Body.Close()
require.NoError(t, resp.Body.Close())
wg.Done()
}

Expand All @@ -286,7 +290,7 @@ func TestClientClosesThenReconnects(t *testing.T) {
resp, err := client.Do(req)
require.NoError(t, err)
require.Equal(t, http.StatusOK, resp.StatusCode)
resp.Body.Close()
require.NoError(t, resp.Body.Close())

wg.Done()
}
Expand Down

0 comments on commit 4933116

Please sign in to comment.