diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-13 07:07:16 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-13 07:07:16 +0000 |
| commit | f18e7f6920590ee6f2e59be508518b70a4611638 (patch) | |
| tree | 2f80c427e740c2c6f7f2a47be2b869b6d9847e58 /service/health/service.go | |
| parent | 5dc83ef5eee77f4d1ef557e5f8b566e75892680d (diff) | |
| parent | bbfcd4fb6eb138c616dab01ea610fbf6ed15985b (diff) | |
Merge #472
472: feat(http): Distinct app and internal error codes in the handleError function r=48d90782 a=48d90782
This PR introduces distinct error codes for the app and internal RR errors.
Errors:
```go
roadrunner.ErrNoAssociatedPool
roadrunner.ErrAllocateWorker
roadrunner.ErrWorkerNotReady
roadrunner.ErrEmptyPayload
roadrunner.ErrPoolStopped
roadrunner.ErrWorkerAllocateTimeout
roadrunner.ErrAllWorkersAreDead
```
now associated with the internal error codes. All other errors are application errors.
Some types of errors are impossible to distinguish in the RR1, for example `json.Unmarshall` internal error or similar.
The `.rr.yaml` now contain two more options for the errors.
```yaml
http:
internalErrorCode: 502,
appErrorCode: 502
```
Default behavior unchanged (500 error code as before), but now might be overridden.
closes #471
Co-authored-by: Valery Piashchynski <[email protected]>
Diffstat (limited to 'service/health/service.go')
| -rw-r--r-- | service/health/service.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/service/health/service.go b/service/health/service.go index ce127340..b9b22a8a 100644 --- a/service/health/service.go +++ b/service/health/service.go @@ -3,11 +3,12 @@ package health import ( "context" "fmt" - "github.com/sirupsen/logrus" "net/http" "sync" "time" + "github.com/sirupsen/logrus" + rrhttp "github.com/spiral/roadrunner/service/http" ) @@ -45,8 +46,8 @@ func (s *Service) Serve() error { // Configure and start the http server s.mu.Lock() s.http = &http.Server{ - Addr: s.cfg.Address, - Handler: s, + Addr: s.cfg.Address, + Handler: s, IdleTimeout: time.Hour * 24, ReadTimeout: time.Minute * 60, MaxHeaderBytes: maxHeaderSize, |