From e4a37d098669e0cbcebfbbb115c62ee96faa0bf1 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 23 Jan 2019 15:13:11 +0000 Subject: [PATCH] Replace select with simpler error check The documentation for Context states that this is just as good: // If Done is not yet closed, Err returns nil. // If Done is closed, Err returns a non-nil error Signed-off-by: Bryan Boreham --- promql/engine.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/promql/engine.go b/promql/engine.go index 14af55b935..39923723d3 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -182,12 +182,10 @@ func (q *query) Exec(ctx context.Context) *Result { // contextDone returns an error if the context was canceled or timed out. func contextDone(ctx context.Context, env string) error { - select { - case <-ctx.Done(): - return contextErr(ctx.Err(), env) - default: - return nil + if err := ctx.Err(); err != nil { + return contextErr(err, env) } + return nil } func contextErr(err error, env string) error {