Skip to content
Snippets Groups Projects

WIP: Develop

Merged Ghost User requested to merge develop into master
7 files
+ 86
8
Compare changes
  • Side-by-side
  • Inline
Files
7
+ 7
1
@@ -33,10 +33,12 @@ package cmd
import (
"context"
"fmt"
"os"
"path/filepath"
"code.fbi.h-da.de/danet/gosdn/controller"
"code.fbi.h-da.de/danet/gosdn/controller/config"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@@ -96,10 +98,14 @@ func initConfig() {
// Use config file from the flag.
viper.SetConfigFile(cfgFile)
} else {
env := config.DetermineConfigEnvironment()
log.Infof("environment is %s\n", env)
viper.AddConfigPath(configHome)
viper.AddConfigPath("/usr/local/etc/gosdn/")
viper.SetConfigType(configType)
viper.SetConfigName(configName)
viper.SetConfigName(fmt.Sprintf("%s-%s", env, configName))
}
viper.AutomaticEnv() // read in environment variables that match
Loading