Skip to content

Commit b0e8e4c

Browse files
authored
Merge pull request #593 from jshufro/jms/v2/lint
Update lint timeout, fix issues
2 parents 2a7858f + 4d0eca9 commit b0e8e4c

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# working-directory: somedir
3636

3737
# Optional: golangci-lint command line arguments.
38-
# args: --issues-exit-code=0
38+
args: --timeout=5m
3939

4040
# Optional: show only new issues if it's a pull request. The default value is `false`.
4141
# only-new-issues: true

rocketpool-daemon/api/minipool/minipool-context.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,38 @@ func RegisterMinipoolRoute[ContextType IMinipoolCallContext[DataType], DataType
6161
serviceProvider *services.ServiceProvider,
6262
) {
6363
router.HandleFunc(fmt.Sprintf("/%s", functionName), func(w http.ResponseWriter, r *http.Request) {
64+
var err error
65+
6466
// Log
6567
args := r.URL.Query()
6668
logger.Info("New request", slog.String(log.MethodKey, r.Method), slog.String(log.PathKey, r.URL.Path))
6769
logger.Debug("Request params:", slog.String(log.QueryKey, r.URL.RawQuery))
6870

6971
// Check the method
7072
if r.Method != http.MethodGet {
71-
server.HandleInvalidMethod(logger.Logger, w)
73+
err = server.HandleInvalidMethod(logger.Logger, w)
74+
if err != nil {
75+
logger.Warn("Error while writing invalid message http response", log.Err(err))
76+
}
7277
return
7378
}
7479

7580
// Create the handler and deal with any input validation errors
7681
mpContext, err := factory.Create(args)
7782
if err != nil {
78-
server.HandleInputError(logger.Logger, w, err)
83+
err = server.HandleInputError(logger.Logger, w, err)
84+
if err != nil {
85+
logger.Warn("Error while writing invalid request http response", log.Err(err))
86+
}
7987
return
8088
}
8189

8290
// Run the context's processing routine
8391
status, response, err := runMinipoolRoute[DataType](ctx, mpContext, serviceProvider)
84-
server.HandleResponse(logger.Logger, w, status, response, err)
92+
err = server.HandleResponse(logger.Logger, w, status, response, err)
93+
if err != nil {
94+
logger.Warn("Error while writing http response", log.Err(err))
95+
}
8596
})
8697
}
8798

0 commit comments

Comments
 (0)