c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(oohelperd): log messages at info level (#896)

Browse source 
We're using a request-specific logger where we also print the ID
of the request. This design helps to observe logs produced by
concurrent requests.

Part of https://github.com/ooni/probe/issues/2183

While there, fix https://github.com/ooni/probe/issues/2241
This commit is contained in:
Simone Basso 2022-08-28 22:26:58 +02:00 • committed by GitHub
commit 4241ee4bc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 225 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/cmd/oohelperd/http.go
View file

@ -30,11 +30,14 @@ type httpConfig struct {
// Headers is OPTIONAL and contains the request headers we should set.
Headers map[string][]string
// Logger is the MANDATORY logger to use.
Logger model.Logger
// MaxAcceptableBody is MANDATORY and specifies the maximum acceptable body size.
MaxAcceptableBody int64
// NewClient is the MANDATORY factory to create a new client.
NewClient func() model.HTTPClient
NewClient func(model.Logger) model.HTTPClient
// Out is the MANDATORY channel where we'll post results.
Out chan ctrlHTTPResponse
@ -48,6 +51,7 @@ type httpConfig struct {
// httpDo performs the HTTP check.
func httpDo(ctx context.Context, config *httpConfig) {
ol := measurexlite.NewOperationLogger(config.Logger, "GET %s", config.URL)
const timeout = 15 * time.Second
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
@ -62,6 +66,7 @@ func httpDo(ctx context.Context, config *httpConfig) {
Headers: map[string]string{},
StatusCode: -1,
}
ol.Stop(err)
return
}
// The original test helper failed with extra headers while here
@ -74,7 +79,7 @@ func httpDo(ctx context.Context, config *httpConfig) {
}
}
}
clnt := config.NewClient()
clnt := config.NewClient(config.Logger)
defer clnt.CloseIdleConnections()
resp, err := clnt.Do(req)
if err != nil {
@ -86,6 +91,7 @@ func httpDo(ctx context.Context, config *httpConfig) {
Headers: map[string]string{},
StatusCode: -1,
}
ol.Stop(err)
return
}
defer resp.Body.Close()
@ -95,6 +101,7 @@ func httpDo(ctx context.Context, config *httpConfig) {
}
reader := &io.LimitedReader{R: resp.Body, N: config.MaxAcceptableBody}
data, err := netxlite.ReadAllContext(ctx, reader)
ol.Stop(err)
config.Out <- ctrlHTTPResponse{
BodyLength: int64(len(data)),
Failure: httpMapFailure(err),