Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from WithoutPants/issues/83 

Disable watching config file to fix #83
This commit is contained in:
StashAppDev 2019-08-24 10:01:37 -07:00 committed by GitHub
parent a786e40aeb f0110083a8
commit 64ccee48ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/manager/manager.go
View File

@ -1,8 +1,9 @@
package manager package manager
import ( import (
"fmt" "net"
"github.com/fsnotify/fsnotify" "sync"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stashapp/stash/pkg/ffmpeg" "github.com/stashapp/stash/pkg/ffmpeg"
@ -10,8 +11,6 @@ import (
"github.com/stashapp/stash/pkg/manager/config" "github.com/stashapp/stash/pkg/manager/config"
"github.com/stashapp/stash/pkg/manager/paths" "github.com/stashapp/stash/pkg/manager/paths"
"github.com/stashapp/stash/pkg/utils" "github.com/stashapp/stash/pkg/utils"
"net"
"sync"
) )
type singleton struct { type singleton struct {
@ -71,12 +70,15 @@ func initConfig() {
// Set generated to the metadata path for backwards compat // Set generated to the metadata path for backwards compat
viper.SetDefault(config.Generated, viper.GetString(config.Metadata)) viper.SetDefault(config.Generated, viper.GetString(config.Metadata))
// Disabling config watching due to race condition issue
// See: https://github.com/spf13/viper/issues/174
// Changes to the config outside the system will require a restart
// Watch for changes // Watch for changes
viper.WatchConfig() // viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) { // viper.OnConfigChange(func(e fsnotify.Event) {
fmt.Println("Config file changed:", e.Name) // fmt.Println("Config file changed:", e.Name)
instance.refreshConfig() // instance.refreshConfig()
}) // })
//viper.Set("stash", []string{"/", "/stuff"}) //viper.Set("stash", []string{"/", "/stuff"})
//viper.WriteConfig() //viper.WriteConfig()
@ -92,15 +94,15 @@ func initFlags() {
} }
} }
func initEnvs() { func initEnvs() {
viper.SetEnvPrefix("stash") // will be uppercased automatically viper.SetEnvPrefix("stash") // will be uppercased automatically
viper.BindEnv("host") // STASH_HOST viper.BindEnv("host") // STASH_HOST
viper.BindEnv("port") // STASH_PORT viper.BindEnv("port") // STASH_PORT
viper.BindEnv("stash") // STASH_STASH viper.BindEnv("stash") // STASH_STASH
viper.BindEnv("generated") // STASH_GENERATED viper.BindEnv("generated") // STASH_GENERATED
viper.BindEnv("metadata") // STASH_METADATA viper.BindEnv("metadata") // STASH_METADATA
viper.BindEnv("cache") // STASH_CACHE viper.BindEnv("cache") // STASH_CACHE
} }
func initFFMPEG() { func initFFMPEG() {
configDirectory := paths.GetConfigDirectory() configDirectory := paths.GetConfigDirectory()