Merge pull request philchia#43 from gocommon/master

*auth create cache dir

agollo_test.go

@@ -3,6 +3,7 @@ package agollo
 import (
 	"log"
 	"os"
+	"path"
 	"testing"
 	"time"
 
@@ -33,28 +34,46 @@ func teardown() {
 func TestAgolloStart(t *testing.T) {
 	if err := Start(); err == nil {
 		t.Errorf("Start with default app.properties should return err, got :%v", err)
+		return
 	}
 
 	if err := StartWithConfFile("fake.properties"); err == nil {
 		t.Errorf("Start with fake.properties should return err, got :%v", err)
+		return
 	}
 
 	if err := StartWithConfFile("./testdata/app.properties"); err != nil {
 		t.Errorf("Start with app.properties should return nil, got :%v", err)
+		return
 	}
+
+	f, err := os.Stat(path.Dir(defaultClient.getDumpFileName()))
+	if err != nil {
+		t.Errorf("dump file dir should exists, got err:%v", err)
+		return
+	}
+
+	if !f.IsDir() {
+		t.Errorf("dump file dir should be a dir, got file")
+		return
+	}
+
 	if err := Stop(); err != nil {
 		t.Errorf("Stop should return nil, got :%v", err)
+		return
 	}
 	os.Remove(defaultClient.getDumpFileName())
 
 	if err := StartWithConfFile("./testdata/app.properties"); err != nil {
 		t.Errorf("Start with app.properties should return nil, got :%v", err)
+		return
 	}
 	defer Stop()
 	defer os.Remove(defaultClient.getDumpFileName())
 
 	if err := defaultClient.loadLocal(defaultClient.getDumpFileName()); err != nil {
 		t.Errorf("loadLocal should return nil, got: %v", err)
+		return
 	}
 
 	mockserver.Set("application", "key", "value")
@@ -68,11 +87,13 @@ func TestAgolloStart(t *testing.T) {
 	val := GetStringValue("key", "defaultValue")
 	if val != "value" {
 		t.Errorf("GetStringValue of key should = value, got %v", val)
+		return
 	}
 
 	keys := GetAllKeys("application")
 	if len(keys) != 1 {
 		t.Errorf("GetAllKeys should return 1 key")
+		return
 	}
 
 	mockserver.Set("application", "key", "newvalue")
@@ -84,11 +105,13 @@ func TestAgolloStart(t *testing.T) {
 	val = defaultClient.GetStringValue("key", "defaultValue")
 	if val != "newvalue" {
 		t.Errorf("GetStringValue of key should = newvalue, got %v", val)
+		return
 	}
 
 	keys = GetAllKeys("application")
 	if len(keys) != 1 {
 		t.Errorf("GetAllKeys should return 1 key")
+		return
 	}
 
 	mockserver.Delete("application", "key")
@@ -100,11 +123,13 @@ func TestAgolloStart(t *testing.T) {
 	val = GetStringValue("key", "defaultValue")
 	if val != "defaultValue" {
 		t.Errorf("GetStringValue of key should = defaultValue, got %v", val)
+		return
 	}
 
 	keys = GetAllKeys("application")
 	if len(keys) != 0 {
 		t.Errorf("GetAllKeys should return 0 key")
+		return
 	}
 
 	mockserver.Set("client.json", "content", `{"name":"agollo"}`)
@@ -116,10 +141,12 @@ func TestAgolloStart(t *testing.T) {
 	val = GetNameSpaceContent("client.json", "{}")
 	if val != `{"name":"agollo"}` {
 		t.Errorf(`GetStringValue of client.json content should  = {"name":"agollo"}, got %v`, val)
+		return
 	}
 
 	if err := SubscribeToNamespaces("new_namespace.json"); err != nil {
 		t.Error(err)
+		return
 	}
 
 	mockserver.Set("new_namespace.json", "key", "1")
@@ -131,5 +158,6 @@ func TestAgolloStart(t *testing.T) {
 	val = GetStringValueWithNameSpace("new_namespace.json", "key", "defaultValue")
 	if val != `1` {
 		t.Errorf(`GetStringValueWithNameSpace of new_namespace.json content should  = 1, got %v`, val)
+		return
 	}
 }

client.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"path"
 )
 
@@ -52,6 +53,11 @@ func NewClient(conf *Conf) *Client {
 // Start sync config
 func (c *Client) Start() error {
 
+	// check cache dir
+	if err := c.autoCreateCacheDir(); err != nil {
+		return err
+	}
+
 	// preload all config to local first
 	if err := c.preload(); err != nil {
 		return err
@@ -235,3 +241,21 @@ func (c *Client) GetReleaseKey(namespace string) string {
 func (c *Client) setReleaseKey(namespace, releaseKey string) {
 	c.releaseKeyRepo.set(namespace, releaseKey)
 }
+
+// autoCreateCacheDir autoCreateCacheDir
+func (c *Client) autoCreateCacheDir() error {
+	fs, err := os.Stat(c.conf.CacheDir)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return os.MkdirAll(c.conf.CacheDir, os.ModePerm)
+		}
+
+		return err
+	}
+
+	if !fs.IsDir() {
+		return fmt.Errorf("conf.CacheDir is not a dir")
+	}
+
+	return nil
+}

testdata/app.properties

@@ -2,6 +2,6 @@
     "appId":"SampleApp",
     "cluster":"default",
     "namespaceNames":["application", "notexist", "client.json"],
-    "cacheDir": "/tmp",
+    "cacheDir": "/tmp/agollo",
     "ip":"localhost:8080"
 }