Merge pull request #16 from sagarkrkv/fix-expiration-callback

Fix issue #15
jellydator · Feb 25, 2019 · dcd0e0a · dcd0e0a
2 parents f76125a + dfeac74
commit dcd0e0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cache.go b/cache.go
@@ -22,7 +22,7 @@ type Cache struct {
 	priorityQueue          *priorityQueue
 	expirationNotification chan bool
 	expirationTime         time.Time
-	skipTtlExtension	   bool
+	skipTtlExtension       bool
 }
 
 func (cache *Cache) getItem(key string) (*item, bool) {
@@ -56,7 +56,7 @@ func (cache *Cache) startExpirationProcessing() {
 		cache.mutex.Lock()
 		if cache.priorityQueue.Len() > 0 {
 			sleepTime = cache.priorityQueue.items[0].expireAt.Sub(time.Now())
-			if sleepTime < 0 && cache.priorityQueue.items[0].expireAt.IsZero(){
+			if sleepTime < 0 && cache.priorityQueue.items[0].expireAt.IsZero() {
 				sleepTime = time.Hour
 			} else if sleepTime < 0 {
 				sleepTime = time.Microsecond
@@ -88,9 +88,7 @@ func (cache *Cache) startExpirationProcessing() {
 
 				if cache.checkExpireCallback != nil {
 					if !cache.checkExpireCallback(item.key, item.data) {
-						if !cache.skipTtlExtension {
-							item.touch()
-						}
+						item.touch()
 						cache.priorityQueue.update(item)
 						i++
 						if i == cache.priorityQueue.Len() {
@@ -220,6 +218,7 @@ func (cache *Cache) SetCheckExpirationCallback(callback checkExpireCallback) {
 func (cache *Cache) SetNewItemCallback(callback expireCallback) {
 	cache.newItemCallback = callback
 }
+
 // SkipTtlExtensionOnHit allows the user to change the cache behaviour. When this flag is set to true it will
 // no longer extend TTL of items when they are retrieved using Get, or when their expiration condition is evaluated
 // using SetCheckExpirationCallback.

diff --git a/cache_test.go b/cache_test.go
@@ -5,9 +5,10 @@ import (
 	"time"
 
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"log"
 	"sync"
+
+	"github.com/stretchr/testify/assert"
 )
 
 // test for Feature request in issue #12
@@ -29,7 +30,7 @@ func TestCache_SkipTtlExtensionOnHit(t *testing.T) {
 	cache.SkipTtlExtensionOnHit(true)
 	cache.Set("expireTest", "!")
 	// will loop if item does not expire
-	for _, found := cache.Get("expireTest"); found; _, found = cache.Get("expireTest"){
+	for _, found := cache.Get("expireTest"); found; _, found = cache.Get("expireTest") {
 	}
 }
 
@@ -232,6 +233,7 @@ func TestCacheCheckExpirationCallbackFunction(t *testing.T) {
 	var lock sync.Mutex
 
 	cache := NewCache()
+	cache.SkipTtlExtensionOnHit(true)
 	cache.SetTTL(time.Duration(50 * time.Millisecond))
 	cache.SetCheckExpirationCallback(func(key string, value interface{}) bool {
 		if key == "key2" || key == "key4" {