Merge pull request #530 from OdyseeTeam/improve-cache

Fix nil cache response handling
OdyseeTeam · Nov 28, 2024 · 18fd495 · 18fd495
2 parents 0010c3e + 1ef83e7
commit 18fd495
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/query/cache.go b/app/query/cache.go
@@ -127,7 +127,7 @@ func (c *QueryCache) Retrieve(query *Query, getter func() (any, error)) (*Cached
 			if err != nil {
 				ObserveQueryCacheOperation(CacheOperationSet, CacheResultError, cacheReq.Method, start)
 				monitor.ErrorToSentry(fmt.Errorf("error during cache.set: %w", err), map[string]string{ParamMethod: cacheReq.Method})
-				log.Warnf("error during cache.set: %s", err)
+				log.Warnf("error during cache.set (query returned): %s", err)
 				return cacheResp, nil
 			}
 			ObserveQueryCacheOperation(CacheOperationSet, CacheResultSuccess, cacheReq.Method, start)
@@ -240,5 +240,8 @@ func preflightCacheHook(caller *Caller, ctx context.Context) (*jsonrpc.RPCRespon
 	if err != nil {
 		return nil, rpcerrors.NewSDKError(err)
 	}
+	if cachedResp == nil {
+		return nil, nil
+	}
 	return cachedResp.RPCResponse(query.Request.ID), nil
 }