Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions configure/liveconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ type ServerCfg struct {
// default config
var defaultConf = ServerCfg{
ConfigFile: "livego.yaml",
FLVArchive: false,
RTMPNoAuth: false,
FLVArchive: false,
RTMPNoAuth: false,
RTMPAddr: ":1935",
HTTPFLVAddr: ":7001",
HLSAddr: ":7002",
Expand All @@ -82,7 +82,15 @@ var defaultConf = ServerCfg{
}},
}

var Config = viper.New()
var (
Config = viper.New()

// BypassInit can be used to bypass the init() function by setting this
// value to True at compile time.
//
// go build -ldflags "-X 'github.com/gwuhaolin/livego/configure.BypassInit=true'" -o livego main.go
BypassInit string = ""
)

func initLog() {
if l, err := log.ParseLevel(Config.GetString("level")); err == nil {
Expand All @@ -92,6 +100,12 @@ func initLog() {
}

func init() {
if BypassInit == "" {
initDefault()
}
}

func initDefault() {
defer Init()

// Default config
Expand Down