Add Server UUID and use it build CmdID.

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

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 90c1aad..dafb034 100644 (file)
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -11,6 +11,18 @@ import (
        common "github.com/iotbzh/xds-common/golib"
 )
 
+const (
+       // ConfigDir Directory in user HOME directory where xds config will be saved
+       ConfigDir = ".xds-server"
+       // GlobalConfigFilename Global config filename
+       GlobalConfigFilename = "config.json"
+       // ServerDataFilename Server data filename
+       ServerDataFilename = "server-data.xml"
+       // FoldersConfigFilename Folders config filename
+       FoldersConfigFilename = "server-config_folders.xml"
+)
+
+// SyncThingConf definition
 type SyncThingConf struct {
        BinDir          string `json:"binDir"`
        Home            string `json:"home"`
@@ -19,6 +31,7 @@ type SyncThingConf struct {
        RescanIntervalS int    `json:"rescanIntervalS"`
 }
 
+// FileConfig is the JSON structure of xds-server config file (config.json)
 type FileConfig struct {
        WebAppDir    string         `json:"webAppDir"`
        ShareRootDir string         `json:"shareRootDir"`
@@ -28,30 +41,37 @@ type FileConfig struct {
        LogsDir      string         `json:"logsDir"`
 }
 
-// getConfigFromFile reads configuration from a config file.
+// readGlobalConfig 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/ <current_dir>/config.json file
+//  2/ $HOME/.xds-server/config.json file
+//  3/ /etc/xds-server/config.json file
 //  4/ <xds-server executable dir>/config.json file
-
-func updateConfigFromFile(c *Config, confFile string) error {
+func readGlobalConfig(c *Config, confFile string) error {
 
        searchIn := make([]string, 0, 3)
        if confFile != "" {
                searchIn = append(searchIn, confFile)
        }
        if usr, err := user.Current(); err == nil {
-               searchIn = append(searchIn, path.Join(usr.HomeDir, ".xds", "config.json"))
+               searchIn = append(searchIn, path.Join(usr.HomeDir, ConfigDir,
+                       GlobalConfigFilename))
        }
-       cwd, err := os.Getwd()
-       if err == nil {
-               searchIn = append(searchIn, path.Join(cwd, "config.json"))
-       }
-       exePath, err := filepath.Abs(filepath.Dir(os.Args[0]))
+
+       searchIn = append(searchIn, "/etc/xds-server/config.json")
+
+       exePath := os.Args[0]
+       ee, _ := os.Executable()
+       exeAbsPath, err := filepath.Abs(ee)
        if err == nil {
-               searchIn = append(searchIn, path.Join(exePath, "config.json"))
+               exePath, err = filepath.EvalSymlinks(exeAbsPath)
+               if err == nil {
+                       exePath = filepath.Dir(ee)
+               } else {
+                       exePath = filepath.Dir(exeAbsPath)
+               }
        }
+       searchIn = append(searchIn, path.Join(exePath, "config.json"))
 
        var cFile *string
        for _, p := range searchIn {
@@ -64,13 +84,11 @@ func updateConfigFromFile(c *Config, confFile string) error {
                // No config file found
                return nil
        }
-
-       c.Log.Infof("Use config file: %s", *cFile)
+       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
-
        fd, _ := os.Open(*cFile)
        defer fd.Close()
        fCfg := FileConfig{}
@@ -79,14 +97,15 @@ func updateConfigFromFile(c *Config, confFile string) error {
        }
 
        // Support environment variables (IOW ${MY_ENV_VAR} syntax) in config.json
-       for _, field := range []*string{
+       vars := []*string{
                &fCfg.WebAppDir,
                &fCfg.ShareRootDir,
                &fCfg.SdkRootDir,
-               &fCfg.LogsDir,
-               &fCfg.SThgConf.Home,
-               &fCfg.SThgConf.BinDir} {
-
+               &fCfg.LogsDir}
+       if fCfg.SThgConf != nil {
+               vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
+       }
+       for _, field := range vars {
                var err error
                if *field, err = common.ResolveEnvVar(*field); err != nil {
                        return err
@@ -106,12 +125,17 @@ func updateConfigFromFile(c *Config, confFile string) error {
        if fCfg.HTTPPort == "" {
                fCfg.HTTPPort = c.FileConf.HTTPPort
        }
+       if fCfg.LogsDir == "" {
+               fCfg.LogsDir = c.FileConf.LogsDir
+       }
 
        // Resolve webapp dir (support relative or full path)
        fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
        if !strings.HasPrefix(fCfg.WebAppDir, "/") && exePath != "" {
+               cwd, _ := os.Getwd()
+
                // Check first from current directory
-               for _, rootD := range []string{cwd, exePath} {
+               for _, rootD := range []string{exePath, cwd} {
                        ff := path.Join(rootD, fCfg.WebAppDir, "index.html")
                        if common.Exists(ff) {
                                fCfg.WebAppDir = path.Join(rootD, fCfg.WebAppDir)
@@ -123,3 +147,21 @@ func updateConfigFromFile(c *Config, confFile string) error {
        c.FileConf = fCfg
        return nil
 }
+
+func configFilenameGet(cfgFile string) (string, error) {
+       usr, err := user.Current()
+       if err != nil {
+               return "", err
+       }
+       return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
+}
+
+// FoldersConfigFilenameGet
+func FoldersConfigFilenameGet() (string, error) {
+       return configFilenameGet(FoldersConfigFilename)
+}
+
+// ServerDataFilenameGet
+func ServerDataFilenameGet() (string, error) {
+       return configFilenameGet(ServerDataFilename)
+}