Merge pull request #2629 from knabben/revise-root

Convert root path to absolute on create command
This commit is contained in:
Kir Kolyshkin
2020-10-06 13:45:01 -07:00
committed by GitHub
2 changed files with 18 additions and 0 deletions
+3
View File
@@ -147,6 +147,9 @@ func main() {
fatal(err)
}
}
if err := reviseRootDir(context); err != nil {
return err
}
return logs.ConfigureLogging(createLogConfig(context))
}
+15
View File
@@ -92,6 +92,21 @@ func revisePidFile(context *cli.Context) error {
return context.Set("pid-file", pidFile)
}
// reviseRootDir convert the root to absolute path
func reviseRootDir(context *cli.Context) error {
root := context.GlobalString("root")
if root == "" {
return nil
}
root, err := filepath.Abs(root)
if err != nil {
return err
}
return context.GlobalSet("root", root)
}
// parseBoolOrAuto returns (nil, nil) if s is empty or "auto"
func parseBoolOrAuto(s string) (*bool, error) {
if s == "" || strings.ToLower(s) == "auto" {