add Eval & Backup

Author: tietang

example/ccs.go

@@ -31,7 +31,7 @@ func main_css() {
 	//zccs := zk.NewZookeeperCompositeConfigSource(contexts, urls, time.Second*3)
 	configSources := []kvs.ConfigSource{pcs1, pcs2}
 	ccs := kvs.NewDefaultCompositeConfigSource(configSources...)
-	ccs.SaveToDisk()
+	ccs.Backup()
 
 	//
 

go.mod

@@ -39,6 +39,7 @@ require (
 	github.com/gogo/protobuf v1.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
 	github.com/google/btree v1.0.0 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
 	github.com/gorilla/websocket v1.4.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -56,7 +57,8 @@ require (
 	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.6.0
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
+	github.com/smartystreets/assertions v1.1.1 // indirect
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/soheilhy/cmux v0.1.4 // indirect
 	github.com/tietang/go-utils v0.1.3
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect

kvs/backup.go

@@ -0,0 +1,78 @@
+package kvs
+
+import (
+	log "github.com/sirupsen/logrus"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+const (
+	BackupFile = ".conf/all.properties"
+)
+
+type Backup interface {
+	Restore()
+	Backup()
+}
+
+var _ Backup = new(CompositeConfigSource)
+
+type DiskBackup struct {
+	ccs            CompositeConfigSource
+	BackupFileName string
+}
+
+func (d *DiskBackup) Restore() {
+	props := NewPropertiesConfigSource(d.BackupFileName)
+	d.ccs.Add(props)
+}
+
+func (d *DiskBackup) Backup() {
+
+	dir, _ := os.Getwd()
+	now := time.Now()
+	time := now.Format("20060102150405")
+	d.BackupFileName = filepath.Join(dir, BackupFile)
+	if PathExists(d.BackupFileName) {
+		newFileName := filepath.Join(dir, BackupFile+"."+time)
+		err := os.Rename(d.BackupFileName, newFileName)
+		if err != nil {
+			log.Error(err)
+			log.Error("重命名本地文件失败:"+d.BackupFileName, " to ", newFileName)
+			return
+		}
+	}
+	os.MkdirAll(filepath.Dir(d.BackupFileName), os.ModePerm)
+	f, err := os.Create(d.BackupFileName)
+	if err != nil {
+		log.Error(err)
+		log.Error("备份到本地文件失败:" + d.BackupFileName)
+		return
+	}
+	defer f.Close()
+	for _, k := range d.ccs.Keys() {
+		v := d.ccs.GetDefault(k, "")
+		f.WriteString(k)
+		f.WriteString("=")
+		f.WriteString(v)
+		f.WriteString("\n")
+		err = f.Sync()
+		if err != nil {
+			log.Error(err)
+		}
+	}
+
+}
+
+func PathExists(path string) bool {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true
+	}
+	if os.IsNotExist(err) {
+		log.Warn(err)
+		return false
+	}
+	return false
+}

kvs/config_composite.go

@@ -11,10 +11,6 @@ import (
 	"time"
 )
 
-const (
-	BackupFile = ".conf/all.properties"
-)
-
 //
 type CompositeConfigSource struct {
 	ConfName      string
@@ -59,11 +55,12 @@ func NewCompositeConfigSource(name string, isAppendSystemEnv bool, configSources
 	}
 	return s
 }
-func (ccs *CompositeConfigSource) FallbackFromDisk() {
+
+func (ccs *CompositeConfigSource) Restore() {
 	props := NewPropertiesConfigSource(ccs.backFileName)
 	ccs.Add(props)
 }
-func (ccs *CompositeConfigSource) SaveToDisk() {
+func (ccs *CompositeConfigSource) Backup() {
 
 	dir, _ := os.Getwd()
 	now := time.Now()
@@ -100,18 +97,6 @@ func (ccs *CompositeConfigSource) SaveToDisk() {
 
 }
 
-func PathExists(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-	if os.IsNotExist(err) {
-		log.Warn(err)
-		return false
-	}
-	return false
-}
-
 func (ccs *CompositeConfigSource) Name() string {
 	return ccs.ConfName
 }
@@ -151,19 +136,24 @@ func (ccs *CompositeConfigSource) KeyValue(key string) *KeyValue {
 			break
 		}
 	}
-
+	var kv *KeyValue
+	defer func() {
+		if kv != nil && kv.err != nil {
+			log.Warnf("for `%s` err: %s ", key, kv.err.Error())
+		}
+	}()
 	if __reg.MatchString(val) {
-		v, err := ccs.evalValue(val)
-		kv := NewKeyValue(key, v)
+		v, err := ccs.EvalValue(val)
+		kv = NewKeyValue(key, v)
 		kv.err = err
 		return kv
 	}
 	if hasExists {
-		kv := NewKeyValue(key, val)
+		kv = NewKeyValue(key, val)
 		kv.err = nil
 		return kv
 	} else {
-		kv := NewKeyValue(key, val)
+		kv = NewKeyValue(key, val)
 		kv.err = errors.New("not exists for key: " + key)
 		return kv
 	}
@@ -336,7 +326,7 @@ func (ccs *CompositeConfigSource) GetValue(key string) (string, error) {
 	//}
 	//
 	//if __reg.MatchString(val) {
-	//    return ccs.evalValue(val)
+	//    return ccs.EvalValue(val)
 	//}
 	//if hasExists {
 	//    return val, nil
@@ -349,7 +339,7 @@ func (ccs *CompositeConfigSource) GetValue(key string) (string, error) {
 	return kv.value, kv.err
 }
 
-func (ccs *CompositeConfigSource) evalValue(value string) (string, error) {
+func (ccs *CompositeConfigSource) EvalValue(value string) (string, error) {
 	if strings.Contains(value, ccs.StartTag) {
 		eval := fasttemplate.New(value, ccs.StartTag, ccs.EndTag)
 		str := eval.ExecuteFuncString(func(w io.Writer, tag string) (int, error) {
@@ -360,7 +350,11 @@ func (ccs *CompositeConfigSource) evalValue(value string) (string, error) {
 				return w.Write([]byte(""))
 			}
 		})
-		return str, nil
+		var err error
+		if str != value {
+			str, err = ccs.EvalValue(str)
+		}
+		return str, err
 	}
 	return value, nil
 }

kvs/config_source.go

@@ -2,7 +2,6 @@ package kvs
 
 import (
 	"bufio"
-	"regexp"
 	"strings"
 	"time"
 )
@@ -65,14 +64,6 @@ func ReadContentType(content string) ContentType {
 	return TextContentType
 }
 
-const (
-	__START_TAG   = "${"
-	__END_TAG     = "}"
-	DEFAULT_VALUE = ""
-)
-
-var __reg = regexp.MustCompile("\\$\\{(.*)}")
-
 type ConfigSource interface {
 	Name() string