Fix #23

componet_notify.go

@@ -67,6 +67,7 @@ func getRemoteConfig() ([]*apolloNotify,error) {
 		Timeout:nofity_connect_timeout,
 	},&CallBack{
 		SuccessCallBack:getRemoteConfigSuccessCallBack,
+		NotModifyCallBack:touchApolloConfigCache,
 	})
 
 	if notifies==nil{

componet_timer_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"github.com/zouyx/agollo/test"
 	"time"
+	"fmt"
 )
 
 //func TestInitRefreshInterval(t *testing.T) {
@@ -37,6 +38,60 @@ func TestAutoSyncConfigServices(t *testing.T) {
 	//test.Equal(t,"value2",config.Configurations["key2"])
 }
 
+func TestAutoSyncConfigServicesNormal2NotModified(t *testing.T) {
+	go runMockConfigServer(longNotmodifiedConfigResponse)
+	defer closeMockConfigServer()
+
+	time.Sleep(1*time.Second)
+
+	appConfig.NextTryConnTime=0
+
+	autoSyncConfigServicesSuccessCallBack([]byte(configResponseStr))
+
+	config:=GetCurrentApolloConfig()
+
+	fmt.Println("sleeping 10s")
+
+	time.Sleep(10*time.Second)
+
+	fmt.Println("checking cache time left")
+	it := apolloConfigCache.NewIterator()
+	for i := int64(0); i < apolloConfigCache.EntryCount(); i++ {
+		entry := it.Next()
+		if entry==nil{
+			break
+		}
+		timeLeft, err := apolloConfigCache.TTL([]byte(entry.Key))
+		test.Nil(t,err)
+		fmt.Printf("key:%s,time:%v \n",string(entry.Key),timeLeft)
+		test.Equal(t,timeLeft>=110,true)
+	}
+
+	test.Equal(t,"100004458",config.AppId)
+	test.Equal(t,"default",config.Cluster)
+	test.Equal(t,"application",config.NamespaceName)
+	test.Equal(t,"20170430092936-dee2d58e74515ff3",config.ReleaseKey)
+	test.Equal(t,"value1",getValue("key1"))
+	test.Equal(t,"value2",getValue("key2"))
+
+	err:=autoSyncConfigServices()
+
+	fmt.Println("checking cache time left")
+	it1 := apolloConfigCache.NewIterator()
+	for i := int64(0); i < apolloConfigCache.EntryCount(); i++ {
+		entry := it1.Next()
+		if entry==nil{
+			break
+		}
+		timeLeft, err := apolloConfigCache.TTL([]byte(entry.Key))
+		test.Nil(t,err)
+		fmt.Printf("key:%s,time:%v \n",string(entry.Key),timeLeft)
+		test.Equal(t,timeLeft>=120,true)
+	}
+
+	fmt.Println(err)
+}
+
 //test if not modify
 func TestAutoSyncConfigServicesNotModify(t *testing.T) {
 	go runMockConfigServer(notModifyConfigResponse)

config_server_test.go

@@ -65,6 +65,11 @@ func normalConfigResponse(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
+func longNotmodifiedConfigResponse(rw http.ResponseWriter, req *http.Request) {
+	time.Sleep(500 * time.Microsecond)
+	rw.WriteHeader(http.StatusNotModified)
+}
+
 func changeConfigResponse(rw http.ResponseWriter, req *http.Request) {
 	fmt.Fprintf(rw, configChangeResponseStr)
 }