"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
- "github.com/iotbzh/xds-server/lib/common"
+ common "github.com/iotbzh/xds-common/golib"
)
// Config parameters (json format) of /config command
Folders FoldersConfig `json:"folders"`
// Private (un-exported fields in REST GET /config route)
- FileConf FileConfig `json:"-"`
- WebAppDir string `json:"-"`
- HTTPPort string `json:"-"`
- ShareRootDir string `json:"-"`
- Log *logrus.Logger `json:"-"`
+ FileConf FileConfig `json:"-"`
+ Log *logrus.Logger `json:"-"`
}
// Config default values
DefaultAPIVersion = "1"
DefaultPort = "8000"
DefaultShareDir = "/mnt/share"
+ DefaultSdkRootDir = "/xdt/sdk"
)
// Init loads the configuration on start-up
VersionGitTag: cliCtx.App.Metadata["git-tag"].(string),
Builder: BuilderConfig{},
Folders: FoldersConfig{},
-
- WebAppDir: "webapp/dist",
- HTTPPort: DefaultPort,
- ShareRootDir: DefaultShareDir,
- Log: log,
+ FileConf: FileConfig{
+ WebAppDir: "webapp/dist",
+ ShareRootDir: DefaultShareDir,
+ SdkRootDir: DefaultSdkRootDir,
+ HTTPPort: DefaultPort,
+ },
+ Log: log,
}
// config file settings overwrite default config
}
// Update location of shared dir if needed
- if !common.Exists(c.ShareRootDir) {
- if err := os.MkdirAll(c.ShareRootDir, 0770); err != nil {
+ if !common.Exists(c.FileConf.ShareRootDir) {
+ if err := os.MkdirAll(c.FileConf.ShareRootDir, 0770); err != nil {
return nil, fmt.Errorf("No valid shared directory found: %v", err)
}
}
- c.Log.Infoln("Share root directory: ", c.ShareRootDir)
+ c.Log.Infoln("Share root directory: ", c.FileConf.ShareRootDir)
if c.FileConf.LogsDir != "" && !common.Exists(c.FileConf.LogsDir) {
if err := os.MkdirAll(c.FileConf.LogsDir, 0770); err != nil {