Wrap persist into an item for compatibility with older records

google · Jul 13, 2020 · 582ef45 · 582ef45
1 parent c4c9c9e
commit 582ef45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/persist/mysql.go b/pkg/persist/mysql.go
@@ -102,7 +102,7 @@ func (m *MySQL) loadItems() error {
 		var item cache.Item
 		gd := gob.NewDecoder(bytes.NewBuffer(mi.Value))
 		if err := gd.Decode(&item); err != nil {
-			klog.Errorf("decode failed for %s (saved %s): %w", mi.Key, mi.Saved, err)
+			klog.Errorf("decode failed for %s (saved %s, bytes: %d): %v", mi.Key, mi.Saved, len(mi.Value), err)
 			continue
 		}
 		decoded[mi.Key] = item
@@ -142,7 +142,9 @@ func (m *MySQL) GetNewerThan(key string, t time.Time) *Thing {
 func (m *MySQL) persist(key string, th *Thing) error {
 	b := new(bytes.Buffer)
 	ge := gob.NewEncoder(b)
-	if err := ge.Encode(th); err != nil {
+
+	item := cache.Item{Object: th}
+	if err := ge.Encode(item); err != nil {
 		return fmt.Errorf("encode: %w", err)
 	}
 

diff --git a/pkg/persist/postgres.go b/pkg/persist/postgres.go
@@ -97,7 +97,7 @@ func (m *Postgres) loadItems() error {
 		var item cache.Item
 		gd := gob.NewDecoder(bytes.NewBuffer(mi.Value))
 		if err := gd.Decode(&item); err != nil {
-			klog.Errorf("decode failed for %s (saved %s): %w", mi.Key, mi.Saved, err)
+			klog.Errorf("decode failed for %s (saved %s, bytes: %d): %v", mi.Key, mi.Saved, len(mi.Value), err)
 			continue
 		}
 		decoded[mi.Key] = item
@@ -137,7 +137,9 @@ func (m *Postgres) GetNewerThan(key string, t time.Time) *Thing {
 func (m *Postgres) persist(key string, th *Thing) error {
 	b := new(bytes.Buffer)
 	ge := gob.NewEncoder(b)
-	if err := ge.Encode(th); err != nil {
+
+	item := cache.Item{Object: th}
+	if err := ge.Encode(item); err != nil {
 		return fmt.Errorf("encode: %w", err)
 	}