Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loki: Improve error messages on query timeout or cancel #2453

Merged
merged 2 commits into from
Jul 30, 2020

Conversation

slim-bean
Copy link
Collaborator

Instead of returning "context deadline exceeded" on timeout and "context cancelled" when the query is cancelled, return a more descriptive error message.

…ext cancelled" when the query is cancelled, return a more descriptive error message.
Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great addition

@owen-d
Copy link
Member

owen-d commented Jul 30, 2020

test 👮 in duty

@codecov-commenter
Copy link

Codecov Report

Merging #2453 into master will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2453      +/-   ##
==========================================
- Coverage   62.79%   62.78%   -0.02%     
==========================================
  Files         162      162              
  Lines       13963    13963              
==========================================
- Hits         8768     8766       -2     
- Misses       4513     4514       +1     
- Partials      682      683       +1     
Impacted Files Coverage Δ
pkg/util/server/error.go 100.00% <100.00%> (ø)
pkg/promtail/targets/file/tailer.go 76.13% <0.00%> (-2.28%) ⬇️

@owen-d owen-d merged commit 03e9059 into master Jul 30, 2020
@owen-d owen-d deleted the improve-http-error-messages branch July 30, 2020 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants