Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3025 from thaJeztah/remove_unneeded_locks 

config.Load() remove unneeded locks
This commit is contained in:
Tibor Vass 2021-04-01 03:03:58 -07:00 committed by GitHub
parent b6d0e3bd11 09ddcffb2f
commit 59fd6f0270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/config/config.go
View File

@ -105,18 +105,13 @@ func LoadFromReader(configData io.Reader) (*configfile.ConfigFile, error) {
} }
// TODO remove this temporary hack, which is used to warn about the deprecated ~/.dockercfg file // TODO remove this temporary hack, which is used to warn about the deprecated ~/.dockercfg file
var ( var printLegacyFileWarning bool
mutex sync.RWMutex
printLegacyFileWarning bool
)
// Load reads the configuration files in the given directory, and sets up // Load reads the configuration files in the given directory, and sets up
// the auth config information and returns values. // the auth config information and returns values.
// FIXME: use the internal golang config parser // FIXME: use the internal golang config parser
func Load(configDir string) (*configfile.ConfigFile, error) { func Load(configDir string) (*configfile.ConfigFile, error) {
mutex.Lock()
printLegacyFileWarning = false printLegacyFileWarning = false
mutex.Unlock()
if configDir == "" { if configDir == "" {
configDir = Dir() configDir = Dir()
@ -142,9 +137,7 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
// Can't find latest config file so check for the old one // Can't find latest config file so check for the old one
filename = filepath.Join(getHomeDir(), oldConfigfile) filename = filepath.Join(getHomeDir(), oldConfigfile)
if file, err := os.Open(filename); err == nil { if file, err := os.Open(filename); err == nil {
mutex.Lock()
printLegacyFileWarning = true printLegacyFileWarning = true
mutex.Unlock()
defer file.Close() defer file.Close()
if err := configFile.LegacyLoadFromReader(file); err != nil { if err := configFile.LegacyLoadFromReader(file); err != nil {
return configFile, errors.Wrap(err, filename) return configFile, errors.Wrap(err, filename)
@ -160,8 +153,6 @@ func LoadDefaultConfigFile(stderr io.Writer) *configfile.ConfigFile {
if err != nil { if err != nil {
fmt.Fprintf(stderr, "WARNING: Error loading config file: %v\n", err) fmt.Fprintf(stderr, "WARNING: Error loading config file: %v\n", err)
} }
mutex.RLock()
defer mutex.RUnlock()
if printLegacyFileWarning { if printLegacyFileWarning {
_, _ = fmt.Fprintln(stderr, "WARNING: Support for the legacy ~/.dockercfg configuration file and file-format is deprecated and will be removed in an upcoming release") _, _ = fmt.Fprintln(stderr, "WARNING: Support for the legacy ~/.dockercfg configuration file and file-format is deprecated and will be removed in an upcoming release")
} }