fix: improved logging on Get() 2

Author: trakhimenok

memcache4dalgo/database.go

@@ -59,5 +59,5 @@ func (v database) QueryAllRecords(ctx context.Context, query dal.Query) (records
 }
 
 func (v database) Get(ctx context.Context, record dal.Record) (err error) {
-	return getRecord(ctx, record, v.isCacheable, v.db.Get)
+	return getRecord(ctx, record, "db", v.isCacheable, v.db.Get)
 }

memcache4dalgo/get.go

@@ -3,13 +3,15 @@ package memcache4dalgo
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/dal-go/dalgo/dal"
 	"google.golang.org/appengine/memcache"
 )
 
 func getRecord(
 	ctx context.Context,
 	record dal.Record,
+	caller string,
 	isCacheable func(key *dal.Key) bool,
 	get func(ctx context.Context, record dal.Record) error,
 ) (err error) {
@@ -18,22 +20,26 @@ func getRecord(
 		return get(ctx, record)
 	}
 	mk := key.String()
+	debugf := func(ctx context.Context, format string, args ...any) {
+		if Debugf != nil {
+			Debugf(ctx, "memcache4dalgo.getRecord("+caller+"): "+format, args...)
+		}
+	}
 	var item *memcache.Item
 	if item, err = memcache.Get(ctx, mk); err == nil {
 		record.SetError(nil) // We must indicate we are going to access data for unmarshalling
 		if err = json.Unmarshal(item.Value, record.Data()); err == nil {
-			if Debugf != nil {
-				Debugf(ctx, "memcache4dalgo.getRecord: hit %s", mk)
-			}
-			return
+			debugf(ctx, "cache hit on key=%s", mk)
+			return // No need t get the record from the database
 		} else if Debugf != nil { // Ignore the error and try to get the record from the database
-			Debugf(ctx, "memcache4dalgo.getRecord: failed to unmarshal value from received from memcache ny key=%s: %v", mk, err)
+			debugf(ctx, "failed to unmarshal value from memcache, key=%s: %v", mk, err)
 		}
-	} else if Debugf != nil { // Ignore the error and try to get the record from the database
-		Debugf(ctx, "memcache4dalgo.getRecord: memcache.Get(key=%s) returned error: %v", mk, err)
+	} else {
+		// Ignore the error and try to get the record from the database
+		debugf(ctx, "WARNING: memcache.Get(key=%s) returned error: %v", mk, err)
 	}
 	if err = get(ctx, record); err == nil {
-		if err = setRecordToCache(ctx, record, "getRecord"); err != nil {
+		if err = setRecordToCache(ctx, record, fmt.Sprintf("getRecord(%s)", caller)); err != nil {
 			return
 		}
 	}
@@ -46,7 +52,7 @@ func setRecordToCache(ctx context.Context, record dal.Record, caller string) (er
 		mk := record.Key().String()
 		_ = memcache.Set(ctx, &memcache.Item{Value: value, Key: mk})
 		if Debugf != nil {
-			Debugf(ctx, "memcache4dalgo.%s(): set record to cache with key=%s", caller, mk)
+			Debugf(ctx, "memcache4dalgo.%s: set record to cache with key=%s", caller, mk)
 		}
 	}
 	return

memcache4dalgo/logging.go

@@ -2,4 +2,4 @@ package memcache4dalgo
 
 import "context"
 
-var Debugf func(ctx context.Context, format string, args ...interface{}) = nil
+var Debugf func(ctx context.Context, format string, args ...any) = nil

memcache4dalgo/transaction.go

@@ -24,7 +24,7 @@ func (t transaction) Options() dal.TransactionOptions {
 }
 
 func (t transaction) Get(ctx context.Context, record dal.Record) error {
-	return getRecord(ctx, record, t.isCacheable, t.ro.Get)
+	return getRecord(ctx, record, "tx", t.isCacheable, t.ro.Get)
 }
 
 func (t transaction) GetMulti(ctx context.Context, records []dal.Record) error {
@@ -79,7 +79,7 @@ func (t transaction) UpdateRecord(ctx context.Context, record dal.Record, update
 		return
 	}
 	if err = t.rw.UpdateRecord(ctx, record, updates, preconditions...); err == nil {
-		if err = setRecordToCache(ctx, record, "UpdateRecord"); err != nil {
+		if err = setRecordToCache(ctx, record, "UpdateRecord()"); err != nil {
 			return
 		}
 	}