diff --git a/configure/liveconfig.go b/configure/liveconfig.go index 9df3143f..4018d858 100644 --- a/configure/liveconfig.go +++ b/configure/liveconfig.go @@ -64,7 +64,7 @@ var defaultConf = ServerCfg{ WriteTimeout: 10, ReadTimeout: 10, GopNum: 1, - Server: []Application{{ + Server: Applications{{ Appname: "live", Live: true, Hls: true, @@ -81,13 +81,15 @@ func initLog() { } } -func LoadConfig() { +func init() { defer Init() // Default config b, _ := json.Marshal(defaultConf) defaultConfig := bytes.NewReader(b) - Config.MergeConfig(defaultConfig) + viper.SetConfigType("json") + viper.ReadConfig(defaultConfig) + Config.MergeConfigMap(viper.AllSettings()) // Flags pflag.String("rtmp_addr", ":1935", "RTMP server listen address") @@ -110,6 +112,8 @@ func LoadConfig() { if err != nil { log.Warning(err) log.Info("Using default config") + } else { + Config.MergeInConfig() } // Environment @@ -121,6 +125,7 @@ func LoadConfig() { // Log initLog() + // Print final config c := ServerCfg{} Config.Unmarshal(&c) log.Debugf("Current configurations: \n%# v", pretty.Formatter(c)) diff --git a/main.go b/main.go index e3a7cb22..32a9f2d7 100755 --- a/main.go +++ b/main.go @@ -125,8 +125,6 @@ func main() { } }() - configure.LoadConfig() - log.Infof(` _ _ ____ | | (_)_ _____ / ___| ___