github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename TryAgainLater status code to ServerTimeout

Browse Source
This commit is contained in:
Clayton Coleman
2015-02-12 12:24:34 -05:00
parent 3bc8f4e793
commit c24f4a24b4
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/errors/errors.go
View File

@@ -30,11 +30,11 @@ const (
StatusUnprocessableEntity = 422
StatusTooManyRequests = 429
// HTTP recommendations are for servers to define 5xx error codes
// for scenarios not covered by behavior. In this case, TryAgainLater
// for scenarios not covered by behavior. In this case, ServerTimeout
// is an indication that a transient server error has occured and the
// client *should* retry, with an optional Retry-After header to specify
// the back off window.
StatusTryAgainLater = 504
StatusServerTimeout = 504
)
// StatusError is an error intended for consumption by a REST API server; it can also be
@@ -180,13 +180,13 @@ func NewMethodNotSupported(kind, action string) error {
}}
}
// NewTryAgainLater returns an error indicating the requested action could not be completed due to a
// NewServerTimeout returns an error indicating the requested action could not be completed due to a
// transient error, and the client should try again.
func NewTryAgainLater(kind, operation string) error {
func NewServerTimeout(kind, operation string) error {
return &StatusError{api.Status{
Status: api.StatusFailure,
Code: http.StatusInternalServerError,
Reason: api.StatusReasonTryAgainLater,
Reason: api.StatusReasonServerTimeout,
Details: &api.StatusDetails{
Kind: kind,
ID: operation,
@@ -213,7 +213,7 @@ func NewInternalError(err error) error {
func NewTimeoutError(message string) error {
return &StatusError{api.Status{
Status: api.StatusFailure,
Code: StatusTryAgainLater,
Code: StatusServerTimeout,
Reason: api.StatusReasonTimeout,
Message: fmt.Sprintf("Timeout: %s", message),
}}
@@ -256,10 +256,10 @@ func IsForbidden(err error) bool {
return reasonForError(err) == api.StatusReasonForbidden
}
// IsTryAgainLater determines if err is an error which indicates that the request needs to be retried
// IsServerTimeout determines if err is an error which indicates that the request needs to be retried
// by the client.
func IsTryAgainLater(err error) bool {
return reasonForError(err) == api.StatusReasonTryAgainLater
func IsServerTimeout(err error) bool {
return reasonForError(err) == api.StatusReasonServerTimeout
}
func reasonForError(err error) api.StatusReason {