Browse Source

Merge pull request #188 from kris-nova/master

feat(bypass-init): Adding compile time init() function bypass mechanism
pull/198/head
gwuhaolin 5 years ago committed by GitHub
parent
commit
e8d36e4519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      configure/liveconfig.go

20
configure/liveconfig.go

@ -62,8 +62,8 @@ type ServerCfg struct {
// default config // default config
var defaultConf = ServerCfg{ var defaultConf = ServerCfg{
ConfigFile: "livego.yaml", ConfigFile: "livego.yaml",
FLVArchive: false, FLVArchive: false,
RTMPNoAuth: false, RTMPNoAuth: false,
RTMPAddr: ":1935", RTMPAddr: ":1935",
HTTPFLVAddr: ":7001", HTTPFLVAddr: ":7001",
HLSAddr: ":7002", HLSAddr: ":7002",
@ -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() { func initLog() {
if l, err := log.ParseLevel(Config.GetString("level")); err == nil { if l, err := log.ParseLevel(Config.GetString("level")); err == nil {
@ -92,6 +100,12 @@ func initLog() {
} }
func init() { func init() {
if BypassInit == "" {
initDefault()
}
}
func initDefault() {
defer Init() defer Init()
// Default config // Default config

Loading…
Cancel
Save