Added Copyright header.

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

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 2dbf884..ee9ca14 100644 (file)
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xdsconfig
 
 import (
@@ -13,9 +30,11 @@ import (
 
 const (
        // ConfigDir Directory in user HOME directory where xds config will be saved
-       ConfigDir = ".xds"
+       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"
 )
@@ -42,8 +61,8 @@ type FileConfig struct {
 // 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 readGlobalConfig(c *Config, confFile string) error {
 
@@ -55,14 +74,21 @@ func readGlobalConfig(c *Config, confFile string) error {
                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 {
@@ -75,8 +101,7 @@ func readGlobalConfig(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)
@@ -117,12 +142,17 @@ func readGlobalConfig(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)
@@ -135,11 +165,20 @@ func readGlobalConfig(c *Config, confFile string) error {
        return nil
 }
 
-// FoldersConfigFilenameGet
-func FoldersConfigFilenameGet() (string, error) {
+func configFilenameGet(cfgFile string) (string, error) {
        usr, err := user.Current()
        if err != nil {
                return "", err
        }
-       return path.Join(usr.HomeDir, ConfigDir, FoldersConfigFilename), nil
+       return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
+}
+
+// FoldersConfigFilenameGet
+func FoldersConfigFilenameGet() (string, error) {
+       return configFilenameGet(FoldersConfigFilename)
+}
+
+// ServerDataFilenameGet
+func ServerDataFilenameGet() (string, error) {
+       return configFilenameGet(ServerDataFilename)
 }