containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from rhatdan/VERSION 

Remove extra lock in Reload function
This commit is contained in:
Giuseppe Scrivano 2020-07-20 13:06:01 +02:00 committed by GitHub
parent ca4af3dc38 b6bb9b862f
commit c230858962
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/pkg/config/config.go
View File

@ -874,6 +874,10 @@ func Default() (*Config, error) {
if config != nil || configErr != nil {
return config, configErr
}
return defConfig()
}
func defConfig() (*Config, error) {
config, configErr = NewConfig("")
return config, configErr
}
@ -969,13 +973,11 @@ func (c *Config) Write() error {
// the cached containers.conf files.
func Reload() (*Config, error) {
configMutex.Lock()
configErr = nil
config = nil
configMutex.Unlock()
return Default()
defer configMutex.Unlock()
return defConfig()
}
func (c *Config) ActiveDestination() (string, string, error){
func (c *Config) ActiveDestination() (string, string, error) {
if uri, found := os.LookupEnv("CONTAINER_HOST"); found {
var ident string
if v, found := os.LookupEnv("CONTAINER_SSHKEY"); found {