Merge ab24814 into 7266e61

README.md

@@ -21,15 +21,13 @@ Installation
 ``` shell
 gopm get github.com/cihub/seelog -v -g
 gopm get github.com/coocood/freecache -v -g
-gopm get github.com/zouyx/agollo -v -g
 ```
 
 或者
 
 ``` shell
 go get -u github.com/cihub/seelog
 go get -u github.com/coocood/freecache
-go get -u github.com/zouyx/agollo
 ```
 
 
@@ -71,6 +69,14 @@ func main() {
 }
 ```
 
+- 启动agollo - 自定义cache控件 (v1.7.0+)
+
+``` go
+func main() {
+	 go agollo.StartWithCache(cacheInterface)
+}
+```
+
 - 监听变更事件（阻塞）
 
 ``` go

depend.sh

@@ -1 +1,2 @@
-gopm get github.com/cihub/seelog -v -g
+go get -u github.com/cihub/seelog
+go get -u github.com/coocood/freecache

repository.go

@@ -21,9 +21,29 @@ var (
 	currentConnApolloConfig = &currentApolloConfig{}
 
 	//config from apollo
-	apolloConfigCache = freecache.NewCache(apolloConfigCacheSize)
+	apolloConfigCache CacheInterface = freecache.NewCache(apolloConfigCacheSize)
 )
 
+func initCache(cacheInterface CacheInterface)  {
+	apolloConfigCache=cacheInterface
+}
+
+type CacheInterface interface {
+	Set(key, value []byte, expireSeconds int) (err error)
+
+	EntryCount() (entryCount int64)
+
+	Get(key []byte) (value []byte, err error)
+
+	Del(key []byte) (affected bool)
+
+	NewIterator() *freecache.Iterator
+
+	TTL(key []byte) (timeLeft uint32, err error)
+
+	Clear()
+}
+
 type currentApolloConfig struct {
 	l      sync.RWMutex
 	config *ApolloConnConfig
@@ -128,7 +148,7 @@ func updateApolloConfigCacheTime(expireTime int) {
 	}
 }
 
-func GetApolloConfigCache() *freecache.Cache {
+func GetApolloConfigCache() CacheInterface {
 	return apolloConfigCache
 }
 

start.go

@@ -6,9 +6,20 @@ func Start() error {
 }
 
 func StartWithLogger(loggerInterface LoggerInterface) error {
+	return StartWithParams(loggerInterface,nil)
+}
+
+func StartWithCache(cacheInterface CacheInterface) error {
+	return StartWithParams(nil,cacheInterface)
+}
+
+func StartWithParams(loggerInterface LoggerInterface,cacheInterface CacheInterface) error {
 	if loggerInterface != nil {
 		initLogger(loggerInterface)
 	}
+	if cacheInterface != nil {
+		initCache(cacheInterface)
+	}
 
 	//init server ip list
 	go initServerIpList()