Merge branch 'release/v0.7.10'vv0.7.10

1 files changed, 72 insertions, 0 deletions

diff --git a/ethutil/config.go b/ethutil/config.go
new file mode 100644
index 000000000..ccc7714d0
--- /dev/null
+++ b/ethutil/config.go
@@ -0,0 +1,72 @@
+package ethutil
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/rakyll/globalconf"
+)
+
+// Config struct
+type ConfigManager struct {
+	Db Database
+
+	ExecPath string
+	Debug    bool
+	Diff     bool
+	DiffType string
+	Paranoia bool
+	VmType   int
+
+	conf *globalconf.GlobalConf
+}
+
+var Config *ConfigManager
+
+// Read config
+//
+// Initialize Config from Config File
+func ReadConfig(ConfigFile string, Datadir string, EnvPrefix string) *ConfigManager {
+	if Config == nil {
+		// create ConfigFile if does not exist, otherwise globalconf panic when trying to persist flags
+		if !FileExist(ConfigFile) {
+			fmt.Printf("config file '%s' doesn't exist, creating it\n", ConfigFile)
+			os.Create(ConfigFile)
+		}
+		g, err := globalconf.NewWithOptions(&globalconf.Options{
+			Filename:  ConfigFile,
+			EnvPrefix: EnvPrefix,
+		})
+		if err != nil {
+			fmt.Println(err)
+		} else {
+			g.ParseAll()
+		}
+		Config = &ConfigManager{ExecPath: Datadir, Debug: true, conf: g, Paranoia: true}
+	}
+	return Config
+}
+
+// provides persistence for flags
+func (c *ConfigManager) Save(key string, value interface{}) {
+	f := &flag.Flag{Name: key, Value: newConfValue(value)}
+	c.conf.Set("", f)
+}
+
+func (c *ConfigManager) Delete(key string) {
+	c.conf.Delete("", key)
+}
+
+// private type implementing flag.Value
+type confValue struct {
+	value string
+}
+
+// generic constructor to allow persising non-string values directly
+func newConfValue(value interface{}) *confValue {
+	return &confValue{fmt.Sprintf("%v", value)}
+}
+
+func (self confValue) String() string     { return self.value }
+func (self confValue) Set(s string) error { self.value = s; return nil }