Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added -logfile option.
[src/xds/xds-server.git]
/
lib
/
xdsconfig
/
config.go
diff --git
a/lib/xdsconfig/config.go
b/lib/xdsconfig/config.go
index
3f8a91d
..
f2d0710
100644
(file)
--- a/
lib/xdsconfig/config.go
+++ b/
lib/xdsconfig/config.go
@@
-7,6
+7,7
@@
import (
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
+ common "github.com/iotbzh/xds-common/golib"
)
// Config parameters (json format) of /config command
)
// Config parameters (json format) of /config command
@@
-18,11
+19,8
@@
type Config struct {
Folders FoldersConfig `json:"folders"`
// Private (un-exported fields in REST GET /config route)
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
}
// Config default values
@@
-30,6
+28,7
@@
const (
DefaultAPIVersion = "1"
DefaultPort = "8000"
DefaultShareDir = "/mnt/share"
DefaultAPIVersion = "1"
DefaultPort = "8000"
DefaultShareDir = "/mnt/share"
+ DefaultSdkRootDir = "/xdt/sdk"
)
// Init loads the configuration on start-up
)
// Init loads the configuration on start-up
@@
-43,11
+42,13
@@
func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
VersionGitTag: cliCtx.App.Metadata["git-tag"].(string),
Builder: BuilderConfig{},
Folders: FoldersConfig{},
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
}
// config file settings overwrite default config
@@
-57,14
+58,14
@@
func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
}
// Update location of shared dir if needed
}
// Update location of shared dir if needed
- if !
dirExists(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)
}
}
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 != "" && !
dir
Exists(c.FileConf.LogsDir) {
+ if c.FileConf.LogsDir != "" && !
common.
Exists(c.FileConf.LogsDir) {
if err := os.MkdirAll(c.FileConf.LogsDir, 0770); err != nil {
return nil, fmt.Errorf("Cannot create logs dir: %v", err)
}
if err := os.MkdirAll(c.FileConf.LogsDir, 0770); err != nil {
return nil, fmt.Errorf("Cannot create logs dir: %v", err)
}
@@
-73,11
+74,3
@@
func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
return &c, nil
}
return &c, nil
}
-
-func dirExists(path string) bool {
- _, err := os.Stat(path)
- if os.IsNotExist(err) {
- return false
- }
- return true
-}