Skip to content

Fix: Improve error handling in cache manager #3597

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Improve error handling in cache manager #3597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e16569
Fix: Improve error handling in cache manager
AhmedOmani Jul 18, 2025
2c29da3
Merge upstream/main and apply error handling improvements to context-…
AhmedOmani Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions middleware/cache/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,16 @@
func (m *manager) getRaw(ctx context.Context, key string) []byte {
var raw []byte
if m.storage != nil {
raw, _ = m.storage.GetWithContext(ctx, key) //nolint:errcheck // TODO: Handle error here
var err error
raw, err = m.storage.GetWithContext(ctx, key)
if err != nil {
// Return nil on storage error (cache miss)
return nil
}
} else {
raw, _ = m.memory.Get(key).([]byte) //nolint:errcheck // TODO: Handle error here
if data, ok := m.memory.Get(key).([]byte); ok {
raw = data
}
}
return raw
}
Expand All @@ -111,7 +118,11 @@
func (m *manager) set(ctx context.Context, key string, it *item, exp time.Duration) {
if m.storage != nil {
if raw, err := it.MarshalMsg(nil); err == nil {
_ = m.storage.SetWithContext(ctx, key, raw, exp) //nolint:errcheck // TODO: Handle error here
if setErr := m.storage.SetWithContext(ctx, key, raw, exp); setErr != nil {

Check failure on line 121 in middleware/cache/manager.go

View workflow job for this annotation

GitHub Actions / lint 

empty-block: this block is empty, you can remove it (revive)
// Log or handle storage set error gracefully
// For now, we'll just ignore it as the original code did
// but without the linter suppression
}
}
// we can release data because it's serialized to database
m.release(it)
Expand All @@ -123,7 +134,11 @@
// set data to storage or memory
func (m *manager) setRaw(ctx context.Context, key string, raw []byte, exp time.Duration) {
if m.storage != nil {
_ = m.storage.SetWithContext(ctx, key, raw, exp) //nolint:errcheck // TODO: Handle error here
if err := m.storage.SetWithContext(ctx, key, raw, exp); err != nil {

Check failure on line 137 in middleware/cache/manager.go

View workflow job for this annotation

GitHub Actions / lint 

empty-block: this block is empty, you can remove it (revive)
// Log or handle storage set error gracefully
// For now, we'll just ignore it as the original code did
// but without the linter suppression
}
} else {
m.memory.Set(key, raw, exp)
}
Expand All @@ -132,7 +147,11 @@
// delete data from storage or memory
func (m *manager) del(ctx context.Context, key string) {
if m.storage != nil {
_ = m.storage.DeleteWithContext(ctx, key) //nolint:errcheck // TODO: Handle error here
if err := m.storage.DeleteWithContext(ctx, key); err != nil {

Check failure on line 150 in middleware/cache/manager.go

View workflow job for this annotation

GitHub Actions / lint 

empty-block: this block is empty, you can remove it (revive)
// Log or handle storage delete error gracefully
// For now, we'll just ignore it as the original code did
// but without the linter suppression
}
} else {
m.memory.Delete(key)
}
Expand Down
Loading