Use xds-common go library.

[src/xds/xds-server.git] / lib / xdsconfig / fileconfig.go

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 262d023..90c1aad 100644 (file)
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -6,28 +6,34 @@ import (
        "os/user"
        "path"
        "path/filepath"
-       "regexp"
        "strings"
+
+       common "github.com/iotbzh/xds-common/golib"
 )
 
 type SyncThingConf struct {
-       Home       string `json:"home"`
-       GuiAddress string `json:"gui-address"`
-       GuiAPIKey  string `json:"gui-apikey"`
+       BinDir          string `json:"binDir"`
+       Home            string `json:"home"`
+       GuiAddress      string `json:"gui-address"`
+       GuiAPIKey       string `json:"gui-apikey"`
+       RescanIntervalS int    `json:"rescanIntervalS"`
 }
 
 type FileConfig struct {
-       WebAppDir    string        `json:"webAppDir"`
-       ShareRootDir string        `json:"shareRootDir"`
-       HTTPPort     string        `json:"httpPort"`
-       SThgConf     SyncThingConf `json:"syncthing"`
+       WebAppDir    string         `json:"webAppDir"`
+       ShareRootDir string         `json:"shareRootDir"`
+       SdkRootDir   string         `json:"sdkRootDir"`
+       HTTPPort     string         `json:"httpPort"`
+       SThgConf     *SyncThingConf `json:"syncthing"`
+       LogsDir      string         `json:"logsDir"`
 }
 
 // getConfigFromFile reads configuration from a config file.
 // Order to determine which config file is used:
 //  1/ from command line option: "--config myConfig.json"
 //  2/ $HOME/.xds/config.json file
-//  3/ <xds-server executable dir>/config.json file
+//  3/ <current_dir>/config.json file
+//  4/ <xds-server executable dir>/config.json file
 
 func updateConfigFromFile(c *Config, confFile string) error {
 
@@ -59,6 +65,8 @@ func updateConfigFromFile(c *Config, confFile string) error {
                return nil
        }
 
+       c.Log.Infof("Use config file: %s", *cFile)
+
        // TODO move on viper package to support comments in JSON and also
        // bind with flags (command line options)
        // see https://github.com/spf13/viper#working-with-flags
@@ -69,65 +77,49 @@ func updateConfigFromFile(c *Config, confFile string) error {
        if err := json.NewDecoder(fd).Decode(&fCfg); err != nil {
                return err
        }
-       c.fileConf = fCfg
 
        // Support environment variables (IOW ${MY_ENV_VAR} syntax) in config.json
-       // TODO: better to use reflect package to iterate on fields and be more generic
-       fCfg.WebAppDir = path.Clean(resolveEnvVar(fCfg.WebAppDir))
-       fCfg.ShareRootDir = path.Clean(resolveEnvVar(fCfg.ShareRootDir))
-       fCfg.SThgConf.Home = path.Clean(resolveEnvVar(fCfg.SThgConf.Home))
-
-       // Config file settings overwrite default config
+       for _, field := range []*string{
+               &fCfg.WebAppDir,
+               &fCfg.ShareRootDir,
+               &fCfg.SdkRootDir,
+               &fCfg.LogsDir,
+               &fCfg.SThgConf.Home,
+               &fCfg.SThgConf.BinDir} {
+
+               var err error
+               if *field, err = common.ResolveEnvVar(*field); err != nil {
+                       return err
+               }
+       }
 
-       if fCfg.WebAppDir != "" {
-               c.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
+       // Use config file settings else use default config
+       if fCfg.WebAppDir == "" {
+               fCfg.WebAppDir = c.FileConf.WebAppDir
+       }
+       if fCfg.ShareRootDir == "" {
+               fCfg.ShareRootDir = c.FileConf.ShareRootDir
        }
-       // Is it a full path ?
-       if !strings.HasPrefix(c.WebAppDir, "/") && exePath != "" {
+       if fCfg.SdkRootDir == "" {
+               fCfg.SdkRootDir = c.FileConf.SdkRootDir
+       }
+       if fCfg.HTTPPort == "" {
+               fCfg.HTTPPort = c.FileConf.HTTPPort
+       }
+
+       // Resolve webapp dir (support relative or full path)
+       fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
+       if !strings.HasPrefix(fCfg.WebAppDir, "/") && exePath != "" {
                // Check first from current directory
                for _, rootD := range []string{cwd, exePath} {
-                       ff := path.Join(rootD, c.WebAppDir, "index.html")
-                       if exists(ff) {
-                               c.WebAppDir = path.Join(rootD, c.WebAppDir)
+                       ff := path.Join(rootD, fCfg.WebAppDir, "index.html")
+                       if common.Exists(ff) {
+                               fCfg.WebAppDir = path.Join(rootD, fCfg.WebAppDir)
                                break
                        }
                }
        }
 
-       if fCfg.ShareRootDir != "" {
-               c.ShareRootDir = fCfg.ShareRootDir
-       }
-
-       if fCfg.HTTPPort != "" {
-               c.HTTPPort = fCfg.HTTPPort
-       }
-
+       c.FileConf = fCfg
        return nil
 }
-
-// resolveEnvVar Resolved environment variable regarding the syntax ${MYVAR}
-func resolveEnvVar(s string) string {
-       re := regexp.MustCompile("\\${(.*)}")
-       vars := re.FindAllStringSubmatch(s, -1)
-       res := s
-       for _, v := range vars {
-               val := os.Getenv(v[1])
-               if val != "" {
-                       rer := regexp.MustCompile("\\${" + v[1] + "}")
-                       res = rer.ReplaceAllString(res, val)
-               }
-       }
-       return res
-}
-
-// exists returns whether the given file or directory exists or not
-func exists(path string) bool {
-       _, err := os.Stat(path)
-       if err == nil {
-               return true
-       }
-       if os.IsNotExist(err) {
-               return false
-       }
-       return true
-}