redis cache: check for nil

mgutz · Jun 27, 2015 · e679b9c · e679b9c
1 parent da5d9aa
commit e679b9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/kvs/redis.go b/kvs/redis.go
@@ -72,7 +72,13 @@ func (rs *RedisStore) Get(key string) (string, error) {
  defer conn.Close()
 
  key = rs.ns + key
- return redis.String(conn.Do("GET", key))
+ s, err := redis.String(conn.Do("GET", key))
+ if err == redis.ErrNil {
+ return "", ErrNotFound
+ } else if err != nil {
+ return "", err
+ }
+ return s, nil
 }
 
 // Del deletes a key

diff --git a/sqlx-runner/exec.go b/sqlx-runner/exec.go
@@ -422,7 +422,7 @@ func cacheOrSQL(execer *Execer) (sql string, args []interface{}, value []byte, e
  v, err := Cache.Get(execer.cacheID)
  //logger.Warn("DBG cacheOrSQL.1 getting by id", "id", execer.cacheID, "v", v, "err", err)
  if err != nil && err != kvs.ErrNotFound {
- logger.Error("Unable to read cache key. Continuing with query", "key", execer.cacheID)
+ logger.Error("Unable to read cache key. Continuing with query", "key", execer.cacheID, "err", err)
  } else if v != "" {
  //logger.Warn("DBG cacheOrSQL.11 HIT", "v", v)
  return "", nil, []byte(v), nil
@@ -472,10 +472,10 @@ func setCache(execer *Execer, data interface{}, dataType int) {
  case dtStruct:
  b, err := json.Marshal(data)
  if err != nil {
- logger.Warn("Could not marshal data, clearing", "key", execer.cacheID)
+ logger.Warn("Could not marshal data, clearing", "key", execer.cacheID, "err", err)
  err = Cache.Del(execer.cacheID)
  if err != nil {
- logger.Error("Could not delete cache key", "key", execer.cacheID)
+ logger.Error("Could not delete cache key", "key", execer.cacheID, "err", err)
  }
  return
  }