config : try loading default configuration file /etc/skydive/skydive.yml

If none is given, will not fail starting skydive if the file didn't exist
skydive-project · Apr 5, 2018 · 7088f69 · 7088f69
1 parent b72bfac
commit 7088f69
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cmd/config/config.go b/cmd/config/config.go
@@ -29,16 +29,27 @@ import (
 	"github.com/skydive-project/skydive/logging"
 )
 
+const (
+	DefaultConfigurationFile = "/etc/skydive/skydive.yml"
+)
+
 // LoadConfiguration from a configuration file
 func LoadConfiguration(cfgBackend string, cfgFiles []string) error {
-	if len(cfgFiles) != 0 {
-		if err := config.InitConfig(cfgBackend, cfgFiles); err != nil {
-			return fmt.Errorf("Failed to initialize config: %s", err.Error())
+	if len(cfgFiles) == 0 {
+		if err := config.InitConfig(cfgBackend, []string{DefaultConfigurationFile}); err == nil {
+			if err := logging.InitLogging(); err != nil {
+				return fmt.Errorf("Failed to initialize logging system: %s", err.Error())
+			}
 		}
+		return nil
+	}
 
-		if err := logging.InitLogging(); err != nil {
-			return fmt.Errorf("Failed to initialize logging system: %s", err.Error())
-		}
+	if err := config.InitConfig(cfgBackend, cfgFiles); err != nil {
+		return fmt.Errorf("Failed to initialize config: %s", err.Error())
+	}
+
+	if err := logging.InitLogging(); err != nil {
+		return fmt.Errorf("Failed to initialize logging system: %s", err.Error())
 	}
 
 	return nil

diff --git a/cmd/skydive/skydive.go b/cmd/skydive/skydive.go
@@ -48,7 +48,7 @@ var RootCmd = &cobra.Command{
 }
 
 func init() {
-	RootCmd.PersistentFlags().StringArrayVarP(&cmd.CfgFiles, "conf", "c", []string{"/etc/skydive/skydive.yml"}, "location of Skydive configuration files, default : /etc/skydive/skydive.yml")
+	RootCmd.PersistentFlags().StringArrayVarP(&cmd.CfgFiles, "conf", "c", []string{""}, "location of Skydive configuration files, default try loading /etc/skydive/skydive.yml")
 	RootCmd.PersistentFlags().StringVarP(&cmd.CfgBackend, "config-backend", "b", "file", "configuration backend (defaults to file)")
 
 	executable := path.Base(os.Args[0])