more refactoring and add debug logging

README.md

@@ -428,7 +428,6 @@ uniq.Clear()                      // DEL uniq
 
 ## TODO
 
-- Finish remaining code `TODOs`
 - More test coverage:
     - Better coverage all possible generic types for collections
     - Test Redis commands with some sort of test env `ProcessHook`. This

connections.go

@@ -33,15 +33,15 @@ func SetConfiguration(name, namespace, url string, opts ...RedisOption) error {
 	return nil
 }
 
-func getConnection(name string) (*redis.Client, *string, error) {
+func getConnection(name string) (*redis.Client, string, error) {
 	config, configured := configs[name]
 	if !configured {
-		return nil, nil, fmt.Errorf("%s is not a configured configuration", name)
+		return nil, "", fmt.Errorf("%s is not a configured configuration", name)
 	}
 
 	conn, ok := connections[name]
 	if ok {
-		return conn, &config.namespace, nil
+		return conn, config.namespace, nil
 	}
 
 	conn = redis.NewClient(config.options)
@@ -51,7 +51,7 @@ func getConnection(name string) (*redis.Client, *string, error) {
 		conn.AddHook(newCmdLoggingHook(debugLogger))
 	}
 
-	return conn, &config.namespace, nil
+	return conn, config.namespace, nil
 }
 
 type cmdLoggingHook struct {

counter.go

@@ -64,12 +64,18 @@ func (c *Counter) Decrement(by int64) (int64, error) {
 func (c *Counter) Value() (v int64) {
 	v, err := c.client.Get(c.ctx, c.key).Int64()
 	if err != nil && err != redis.Nil {
-		// TODO debug logging
+		if debugLogger != nil {
+			debugLogger.Warn("Counter#Value", err)
+		}
 	}
 
 	return
 }
 
+func (c *Counter) ValueResult() (int64, error) {
+	return c.client.Get(c.ctx, c.key).Int64()
+}
+
 func (c *Counter) Reset() (err error) {
 	_, err = c.client.Del(c.ctx, c.key).Result()
 	return

counter_test.go

@@ -1,6 +1,8 @@
 package kredis
 
-import "time"
+import (
+	"time"
+)
 
 func (s *KredisTestSuite) TestCounter() {
 	c, err := NewCounter("counter")
@@ -58,3 +60,12 @@ func (s *KredisTestSuite) TestCounterWithDefaultAndExpiry() {
 
 	s.Empty(c.Value())
 }
+
+func (s *KredisTestSuite) TestCounterWIthBadConnection() {
+	c, _ := NewCounter("counter", WithConfigName("badconn"))
+
+	s.Empty(c.Value())
+	s.Equal([]string{
+		"Counter#Value dial tcp [::1]:1234: connect: connection refused",
+	}, testWarnings)
+}

cycle.go

@@ -16,26 +16,33 @@ func NewCycle(key string, values []string, opts ...ProxyOption) (*Cycle, error)
 	return &Cycle{Proxy: *proxy, values: values}, nil
 }
 
-func (c *Cycle) Index() int64 {
-	return c.value()
+func (c *Cycle) Index() (idx int64) {
+	idx, err := c.client.Get(c.ctx, c.key).Int64()
+	if err != nil && err != redis.Nil {
+		if debugLogger != nil {
+			debugLogger.Warn("Cycle#Index", err)
+		}
+	}
+
+	return
+}
+
+func (c *Cycle) IndexResult() (int64, error) {
+	return c.client.Get(c.ctx, c.key).Int64()
 }
 
 func (c *Cycle) Value() string {
 	return c.values[c.Index()]
 }
 
 func (c *Cycle) Next() (err error) {
-	value := (c.value() + 1) % int64(len(c.values))
-	_, err = c.client.Set(c.ctx, c.key, value, c.expiresIn).Result()
-
-	return
-}
-
-func (c *Cycle) value() (v int64) {
-	v, err := c.client.Get(c.ctx, c.key).Int64()
+	idx, err := c.client.Get(c.ctx, c.key).Int64()
 	if err != nil && err != redis.Nil {
-		// TODO debug logging
+		return // GET error
 	}
 
+	value := (idx + 1) % int64(len(c.values))
+	_, err = c.client.Set(c.ctx, c.key, value, c.expiresIn).Result()
+
 	return
 }

flag.go

@@ -60,7 +60,9 @@ func (f *Flag) SoftMark(opts ...FlagMarkOption) error {
 func (f *Flag) IsMarked() bool {
 	n, err := f.client.Exists(f.ctx, f.key).Result()
 	if err != nil && err != redis.Nil {
-		// TODO debug logging
+		if debugLogger != nil {
+			debugLogger.Warn("Flag#IsMarked", err)
+		}
 	}
 
 	return n > 0

kredis_test.go

@@ -2,6 +2,7 @@ package kredis
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -11,13 +12,24 @@ type KredisTestSuite struct {
 	suite.Suite
 }
 
+type testLogger struct{ stdLogger }
+
+var testWarnings []string
+
+func (tl testLogger) Warn(fnName string, err error) {
+	testWarnings = append(testWarnings, fmt.Sprintf("%s %s", fnName, err.Error()))
+}
+
 func (suite *KredisTestSuite) SetupTest() {
 	// TODO use a unique namespace for each test (thus potentially enabling
 	// parallel tests)
 	SetConfiguration("shared", "ns", "redis://localhost:6379/2")
 	SetConfiguration("badconn", "", "redis://localhost:1234/0")
 
 	EnableDebugLogging()
+
+	testWarnings = []string{}
+	SetDebugLogger(&testLogger{})
 }
 
 func (suite *KredisTestSuite) TearDownTest() {

logging.go

@@ -30,8 +30,9 @@ func DisableDebugLogging() {
 	debugLogger = nil
 }
 
-// TODO add a way to configure a user provided value that implements the logging interface
-// func SetCommandLogger(userLogger cmdLogging)
+func SetDebugLogger(userLogger logging) {
+	debugLogger = userLogger
+}
 
 func (log stdLogger) Info(cmd redis.Cmder, dur time.Duration) {
 	name, key, args := cmdLogParts(cmd)
@@ -45,8 +46,8 @@ func (log stdLogger) Info(cmd redis.Cmder, dur time.Duration) {
 	}
 }
 
-func (log stdLogger) Warn(msg string, err error) {
-
+func (log stdLogger) Warn(fnName string, err error) {
+	fmt.Printf("Kredis error in %s: %s", fnName, err.Error())
 }
 
 var cmdColor = color.New(color.FgYellow).SprintFunc()

proxy.go

@@ -26,8 +26,8 @@ func NewProxy(key string, opts ...ProxyOption) (*Proxy, error) {
 		return nil, err
 	}
 
-	if namespace != nil {
-		key = fmt.Sprintf("%s:%s", *namespace, key)
+	if namespace != "" {
+		key = fmt.Sprintf("%s:%s", namespace, key)
 	}
 
 	return &Proxy{

proxy_test.go

@@ -14,8 +14,7 @@ func (s *KredisTestSuite) TestNewProxyWithConfigName() {
 
 	s.NoError(e)
 	s.NotNil(p)
-
-	// TODO assert namespace and connnection details are right??
+	s.Equal("key", p.key)
 }
 
 func (s *KredisTestSuite) TestNewProxyWithExpiresIn() {

slot.go

@@ -1,8 +1,6 @@
 package kredis
 
 import (
-	"fmt"
-
 	"github.com/redis/go-redis/v9"
 )
 
@@ -93,8 +91,9 @@ func (s *Slot) TakenResult() (t int64, err error) {
 func (s *Slot) incr() {
 	_, err := s.client.Incr(s.ctx, s.key).Result()
 	if err != nil {
-		// TODO debug logging
-		fmt.Println(err)
+		if debugLogger != nil {
+			debugLogger.Warn("Slot#Reserve()", err)
+		}
 	}
 
 	s.RefreshTTL()
@@ -103,8 +102,9 @@ func (s *Slot) incr() {
 func (s *Slot) decr() {
 	_, err := s.client.Decr(s.ctx, s.key).Result()
 	if err != nil {
-		// TODO debug logging
-		fmt.Println(err)
+		if debugLogger != nil {
+			debugLogger.Warn("Slot#Release()", err)
+		}
 	}
 
 	s.RefreshTTL()