third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-13 10:47:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix startup order, setting LogLevel

Browse Source
This commit is contained in:
Deluan 2020-01-20 17:35:04 -05:00
parent 1e582bec5c
commit 28cd3ec3e4
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf/configuration.go
View File

@ -41,7 +41,10 @@ func LoadFromEnv() {
Sonic.Port = port
}
l := &multiconfig.EnvironmentLoader{}
l.Load(Sonic)
err := l.Load(Sonic)
if err != nil {
log.Error("Error parsing configuration from environment")
}
}
func LoadFromTags() {
@ -55,7 +58,6 @@ func LoadFromFile(tomlFile string) {
if err != nil {
log.Error("Error loading configuration file", "file", tomlFile, err)
}
log.SetLogLevelString(Sonic.LogLevel)
}
func LoadFromLocalFile() {
@ -68,6 +70,7 @@ func Load() {
LoadFromLocalFile()
LoadFromEnv()
LoadFromFlags()
log.SetLogLevelString(Sonic.LogLevel)
}
func init() {

5
main.go
View File

@ -2,11 +2,16 @@ package main
import (
"github.com/cloudsonic/sonic-server/conf"
"github.com/cloudsonic/sonic-server/server"
)
func main() {
conf.Load()
if !conf.Sonic.DevDisableBanner {
server.ShowBanner()
}
a := CreateServer(conf.Sonic.MusicFolder)
a.MountRouter("/rest", CreateSubsonicAPIRouter())
a.MountRouter("/app", CreateAppRouter("/app"))

4
server/banner.go
View File

@ -14,6 +14,6 @@ Version %s
`
func showBanner(version string) {
fmt.Printf(banner, version)
func ShowBanner() {
fmt.Printf(banner, Version)
}

3
server/server.go
View File

@ -25,9 +25,6 @@ type Server struct {
func New(scanner *scanner.Scanner, ds model.DataStore) *Server {
a := &Server{Scanner: scanner, ds: ds}
if !conf.Sonic.DevDisableBanner {
showBanner(Version)
}
initMimeTypes()
initialSetup(ds)
a.initRoutes()