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/http/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/http/service.go')
-rw-r--r-- | service/http/service.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/service/http/service.go b/service/http/service.go index 25a10064..7a175dcb 100644 --- a/service/http/service.go +++ b/service/http/service.go @@ -118,7 +118,12 @@ func (s *Service) Serve() error { s.rr.Attach(s.controller) } - s.handler = &Handler{cfg: s.cfg, rr: s.rr} + s.handler = &Handler{ + cfg: s.cfg, + rr: s.rr, + internalErrorCode: s.cfg.InternalErrorCode, + appErrorCode: s.cfg.AppErrorCode, + } s.handler.Listen(s.throw) if s.cfg.EnableHTTP() { |