Merge pull request #1 from chrislusf/master

update

1 files changed, 43 insertions, 2 deletions

diff --git a/weed/util/config.go b/weed/util/config.go
index 77cab3019..7b6e92f08 100644
--- a/weed/util/config.go
+++ b/weed/util/config.go
@@ -1,10 +1,51 @@
 package util
 
+import (
+	"strings"
+
+	"github.com/spf13/viper"
+
+	"github.com/chrislusf/seaweedfs/weed/glog"
+)
+
 type Configuration interface {
 	GetString(key string) string
 	GetBool(key string) bool
 	GetInt(key string) int
-	GetInt64(key string) int64
-	GetFloat64(key string) float64
 	GetStringSlice(key string) []string
+	SetDefault(key string, value interface{})
+}
+
+func LoadConfiguration(configFileName string, required bool) (loaded bool) {
+
+	// find a filer store
+	viper.SetConfigName(configFileName)     // name of config file (without extension)
+	viper.AddConfigPath(".")                // optionally look for config in the working directory
+	viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths
+	viper.AddConfigPath("/etc/seaweedfs/")  // path to look for the config file in
+
+	glog.V(1).Infof("Reading %s.toml from %s", configFileName, viper.ConfigFileUsed())
+
+	if err := viper.MergeInConfig(); err != nil { // Handle errors reading the config file
+		glog.V(1).Infof("Reading %s: %v", viper.ConfigFileUsed(), err)
+		if required {
+			glog.Fatalf("Failed to load %s.toml file from current directory, or $HOME/.seaweedfs/, or /etc/seaweedfs/"+
+				"\n\nPlease use this command to generate the default %s.toml file\n"+
+				"    weed scaffold -config=%s -output=.\n\n\n",
+				configFileName, configFileName, configFileName)
+		} else {
+			return false
+		}
+	}
+
+	return true
+}
+
+func GetViper() *viper.Viper {
+	v := &viper.Viper{}
+	*v = *viper.GetViper()
+	v.AutomaticEnv()
+	v.SetEnvPrefix("weed")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	return v
 }