all: add Len

Author: changkun

cache.go

@@ -40,15 +40,27 @@ func (l *lru) clear() {
 	for {
 		select {
 		case <-t.C:
-			l.mu.Lock()
-			for e := l.elems.Front(); e != nil; e = e.Next() {
-				l.elems.Remove(e)
-			}
-			l.mu.Unlock()
+			l.flush()
 		}
 	}
 }
 
+func (l *lru) flush() {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+
+	for e := l.elems.Front(); e != nil; e = e.Next() {
+		l.elems.Remove(e)
+	}
+	l.size = 0
+}
+
+func (l *lru) Len() uint {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+	return l.size
+}
+
 func (l *lru) Get(k string) (string, bool) {
 	l.mu.RLock()
 	defer l.mu.RUnlock()
@@ -77,10 +89,11 @@ func (l *lru) Put(k, v string) {
 	}
 
 	// check if cache is full
+	l.elems.PushFront(i)
 	if l.size+1 > l.cap {
 		l.elems.Remove(l.elems.Back())
+	} else {
+		l.size++
 	}
-	l.elems.PushFront(i)
-	l.size++
 	return
 }

cache_test.go

@@ -12,12 +12,18 @@ func TestLRU(t *testing.T) {
 	if _, ok := l.Get("a"); ok {
 		t.Fatalf("Get value from empty LRU")
 	}
+	if l.Len() != 0 {
+		t.Fatalf("wrong size, want 0, got %v", l.Len())
+	}
 
 	l.Put("a", "1") // a
 	v, ok := l.Get("a")
 	if !ok { // a -> b
 		t.Fatalf("Get value from LRU found nothing")
 	}
+	if l.Len() != 1 {
+		t.Fatalf("wrong size, want 1, got %v", l.Len())
+	}
 
 	l.Put("b", "2") // b -> a
 	v, ok = l.Get("a")
@@ -27,6 +33,10 @@ func TestLRU(t *testing.T) {
 	if v != "1" {
 		t.Fatalf("Get value from LRU want 1 got %v", v)
 	}
+	if l.Len() != 2 {
+		t.Fatalf("wrong size, want 2, got %v", l.Len())
+	}
+
 	l.Put("c", "3") // c -> a
 	_, ok = l.Get("b")
 	if ok {
@@ -39,6 +49,28 @@ func TestLRU(t *testing.T) {
 	if v != "3" {
 		t.Fatalf("Get value from LRU want 3 got %v", v)
 	}
+	if l.Len() != 2 {
+		t.Fatalf("wrong size, want 2, got %v", l.Len())
+	}
+
+	l.flush()
+	if l.Len() != 0 {
+		t.Fatalf("wrong size, want 0, got %v", l.Len())
+	}
+	l.Put("a", "1")
+	l.Put("b", "1")
+	l.Put("c", "1")
+	l.Put("a", "1")
+	v, ok = l.Get("a")
+	if !ok { // a
+		t.Fatalf("Get value from LRU found nothing")
+	}
+	if v != "1" {
+		t.Fatalf("Get value from LRU want 1 got %v", v)
+	}
+	if l.Len() != 2 {
+		t.Fatalf("wrong size, want 2, got %v", l.Len())
+	}
 }
 
 func rands() string {

config_test.go

@@ -18,8 +18,7 @@ func TestParseConfig(t *testing.T) {
 		if v.Field(i).Kind() == reflect.Struct {
 			continue
 		}
-		vv, ok := v.Field(i).Interface().(string)
-		if ok && len(vv) > 0 {
+		if v.Field(i).Interface() != nil {
 			continue
 		}
 		t.Fatalf("read empty from config, field: %v", v.Type().Field(i).Name)

docker/docker-compose.yml

@@ -8,6 +8,8 @@ services:
   redir:
     container_name: redir
     restart: always
+    volumes:
+      - ../data/backup:/data/backup
     image: golang-design/redir:latest
     environment:
       REDIR_CONF: ./data/container.yml