add flush expires on close

niftycache.go

@@ -13,6 +13,7 @@ type Cache struct {
 	setCB        callback
 	expireCB     callback
 	extendTTL    bool
+	flushExpires bool
 	items        map[string]*item
 	ih           *itemsHeap
 	m            *sync.Mutex
@@ -64,6 +65,12 @@ func ExtendTTLOnHit() Option {
 	}
 }
 
+func FlushExpiresOnClose() Option {
+	return func(nc *Cache) {
+		nc.flushExpires = true
+	}
+}
+
 func MaxExpires(maxExpires int) Option {
 	return func(nc *Cache) {
 		nc.maxExpires = maxExpires
@@ -149,6 +156,17 @@ func (nc *Cache) handleExpirations() {
 		select {
 		case <-nc.done:
 			t.Stop()
+			if nc.flushExpires {
+				nc.m.Lock()
+				for item := nc.ih.peek(); item != nil; item = nc.ih.peek() {
+					delete(nc.items, item.key)
+					nc.ih.pop()
+					if nc.expireCB != nil {
+						nc.callbacks.Add(nc.expireCB(item.key, item.value))
+					}
+				}
+				nc.m.Unlock()
+			}
 			nc.wg1.Done()
 			return
 		case <-t.C: