Skip to content

Commit 01876c5

Browse files
refactoring into utils method
1 parent 96440e6 commit 01876c5

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

internal/cortex/frontend/transport/handler.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,14 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
173173
writeError(w, err)
174174
queryString = f.parseRequestQueryString(r, buf)
175175

176-
// Check if caching is enabled.
177-
if f.failedQueryCache != nil {
178-
success, message := f.failedQueryCache.UpdateFailedQueryCache(err, queryExpressionNormalized, queryExpressionRangeLength, f.failedQueryCache.LruCache)
179-
if success {
180-
level.Info(util_log.WithContext(r.Context(), f.log)).Log(message)
176+
// Try to update cache.
177+
success, message := f.failedQueryCache.CallUpdateFailedQueryCache(err, queryExpressionNormalized, queryExpressionRangeLength)
178+
179+
if success {
180+
level.Info(util_log.WithContext(r.Context(), f.log)).Log(message)
181+
} else {
182+
if message == "Failed query cache is not enabled" {
183+
level.Debug(util_log.WithContext(r.Context(), f.log)).Log(message)
181184
} else {
182185
level.Error(util_log.WithContext(r.Context(), f.log)).Log(message)
183186
}

internal/cortex/frontend/transport/utils/utils.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,11 @@ func GetQueryRangeSeconds(query url.Values) int {
139139
func (f *FailedQueryCache) NormalizeQueryString(query url.Values) string {
140140
return f.regex.ReplaceAllString(query.Get("query"), " ")
141141
}
142+
143+
func (f *FailedQueryCache) CallUpdateFailedQueryCache(err error, queryExpressionNormalized string, queryExpressionRangeLength int) (bool, string) {
144+
if f == nil {
145+
return false, "Failed query cache is not enabled"
146+
}
147+
success, message := f.UpdateFailedQueryCache(err, queryExpressionNormalized, queryExpressionRangeLength, f.LruCache)
148+
return success, message
149+
}

0 commit comments

Comments
 (0)