phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl/images: Fix embedded sync.Mutex

Browse source
This commit is contained in:
Cameron Moore 2017-05-02 02:17:14 -05:00 committed by Bjørn Erik Pedersen
parent f69df916df
commit f604076de1
2 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
docs/data/docs.json
View file

@ -727,36 +727,6 @@
"imageConfig" "imageConfig"
], ],
"Examples": [] "Examples": []
},
{
"Name": "Lock",
"Description": "",
"Aliases": null,
"Examples": null
},
{
"Name": "RLock",
"Description": "",
"Aliases": null,
"Examples": null
},
{
"Name": "RLocker",
"Description": "",
"Aliases": null,
"Examples": null
},
{
"Name": "RUnlock",
"Description": "",
"Aliases": null,
"Examples": null
},
{
"Name": "Unlock",
"Description": "",
"Aliases": null,
"Examples": null
} }
] ]
}, },

12
tpl/images/images.go
View file

@ -37,8 +37,8 @@ func New(deps *deps.Deps) *Namespace {
// Namespace provides template functions for the "images" namespace. // Namespace provides template functions for the "images" namespace.
type Namespace struct { type Namespace struct {
sync.RWMutex cacheMu sync.RWMutex
cache map[string]image.Config cache map[string]image.Config
deps *deps.Deps deps *deps.Deps
} }
@ -56,9 +56,9 @@ func (ns *Namespace) Config(path interface{}) (image.Config, error) {
} }
// Check cache for image config. // Check cache for image config.
ns.RLock() ns.cacheMu.RLock()
config, ok := ns.cache[filename] config, ok := ns.cache[filename]
ns.RUnlock() ns.cacheMu.RUnlock()
if ok { if ok {
return config, nil return config, nil
@ -71,9 +71,9 @@ func (ns *Namespace) Config(path interface{}) (image.Config, error) {
config, _, err = image.DecodeConfig(f) config, _, err = image.DecodeConfig(f)
ns.Lock() ns.cacheMu.Lock()
ns.cache[filename] = config ns.cache[filename] = config
ns.Unlock() ns.cacheMu.Unlock()
return config, err return config, err
} }