Finish v2.1.4

.gitignore

@@ -17,3 +17,4 @@
 /application.json
 application*.json
 /abc1.json
+/env_test.properties

app_config.go

@@ -4,12 +4,16 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"os"
 	"strings"
 	"sync"
 	"time"
 )
 
-const appConfigFileName = "app.properties"
+const (
+	APP_CONFIG_FILE_NAME = "app.properties"
+	ENV_CONFIG_FILE_PATH = "AGOLLO_CONF"
+)
 
 var (
 	long_poll_interval        = 2 * time.Second //2s
@@ -177,7 +181,11 @@ func getLoadAppConfig(loadAppConfig func() (*AppConfig, error)) (*AppConfig, err
 	if loadAppConfig != nil {
 		return loadAppConfig()
 	}
-	return loadJsonConfig(appConfigFileName)
+	configPath := os.Getenv(ENV_CONFIG_FILE_PATH)
+	if configPath==""{
+		configPath=APP_CONFIG_FILE_NAME
+	}
+	return loadJsonConfig(configPath)
 }
 
 //set timer for update ip list

json_config_test.go

@@ -1,12 +1,14 @@
 package agollo
 
 import (
+	"encoding/json"
 	. "github.com/tevid/gohamcrest"
+	"os"
 	"testing"
 )
 
 func TestLoadJsonConfig(t *testing.T) {
-	config, err := loadJsonConfig(appConfigFileName)
+	config, err := loadJsonConfig(APP_CONFIG_FILE_NAME)
 	t.Log(config)
 
 	Assert(t, err,NilVal())
@@ -18,6 +20,38 @@ func TestLoadJsonConfig(t *testing.T) {
 
 }
 
+
+func TestLoadEnvConfig(t *testing.T) {
+	envConfigFile:="env_test.properties"
+	config, _ := loadJsonConfig(APP_CONFIG_FILE_NAME)
+	config.Ip="123"
+	config.AppId="1111"
+	config.NamespaceName="nsabbda"
+	file, err := os.Create(envConfigFile)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	defer file.Close()
+	err = json.NewEncoder(file).Encode(config)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+
+	err = os.Setenv(ENV_CONFIG_FILE_PATH, envConfigFile)
+	envConfig, envConfigErr := getLoadAppConfig(nil)
+	t.Log(config)
+
+	Assert(t, envConfigErr,NilVal())
+	Assert(t, envConfig,NotNilVal())
+	Assert(t, envConfig.AppId, Equal(config.AppId))
+	Assert(t, envConfig.Cluster, Equal(config.Cluster))
+	Assert(t, envConfig.NamespaceName,Equal(config.NamespaceName))
+	Assert(t, envConfig.Ip, Equal(config.Ip))
+
+}
+
 func TestLoadJsonConfigWrongFile(t *testing.T) {
 	config, err := loadJsonConfig("")
 	Assert(t, err,NotNilVal())