Remove inits since it is startup code

This commit is contained in:
joeyak 2019-03-24 23:54:24 -04:00
parent 86207ecd48
commit f60bd33011
3 changed files with 24 additions and 31 deletions

View File

@ -7,11 +7,7 @@ import (
"os"
)
var logDev *log.Logger
func init() {
logDev = log.New(os.Stdout, "[DEV]", log.LstdFlags)
}
var logDev *log.Logger = log.New(os.Stdout, "[DEV]", log.LstdFlags)
func LogDevf(format string, v ...interface{}) {
logDev.Printf(format, v...)

29
main.go
View File

@ -14,21 +14,38 @@ import (
var (
addr string
sKey string
stats streamStats
stats = newStreamStats()
)
func init() {
format.RegisterAll()
func setupSettings() {
var err error
settings, err = LoadSettings("settings.json")
if err != nil {
panic("Unable to load settings: " + err.Error())
}
if len(settings.StreamKey) == 0 {
panic("Missing stream key is settings.json")
}
flag.StringVar(&addr, "l", ":8089", "host:port of the MovieNight")
flag.StringVar(&sKey, "k", "", "Stream key, to protect your stream")
if err = settings.SetupLogging(); err != nil {
panic("Unable to setup logger: " + err.Error())
}
stats = newStreamStats()
// Save admin password to file
if err = settings.Save(); err != nil {
panic("Unable to save settings: " + err.Error())
}
}
func main() {
flag.StringVar(&addr, "l", ":8089", "host:port of the MovieNight")
flag.StringVar(&sKey, "k", "", "Stream key, to protect your stream")
flag.Parse()
format.RegisterAll()
setupSettings()
exit := make(chan bool)
go handleInterrupt(exit)

View File

@ -39,26 +39,6 @@ type BanInfo struct {
When time.Time
}
func init() {
var err error
settings, err = LoadSettings("settings.json")
if err != nil {
panic("Unable to load settings: " + err.Error())
}
if len(settings.StreamKey) == 0 {
panic("Missing stream key is settings.json")
}
if err = settings.SetupLogging(); err != nil {
panic("Unable to setup logger: " + err.Error())
}
// Save admin password to file
if err = settings.Save(); err != nil {
panic("Unable to save settings: " + err.Error())
}
}
func LoadSettings(filename string) (*Settings, error) {
raw, err := ioutil.ReadFile(filename)
if err != nil {