github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Avoid multiple locks for shortcode template

Browse source 
Fixes #1600
This commit is contained in:
Bjørn Erik Pedersen 2015-11-21 23:29:58 +01:00
parent c5f40e8b8b
commit 6fa7f2ac3e
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hugolib/shortcode.go
View file

@ -160,21 +160,24 @@ var isInnerShortcodeCache = struct {
// to avoid potential costly look-aheads for closing tags we look inside the template itself // to avoid potential costly look-aheads for closing tags we look inside the template itself
// we could change the syntax to self-closing tags, but that would make users cry // we could change the syntax to self-closing tags, but that would make users cry
// the value found is cached // the value found is cached
func isInnerShortcode(t *template.Template) bool { func isInnerShortcode(t *template.Template) (bool, error) {
isInnerShortcodeCache.RLock() isInnerShortcodeCache.RLock()
m, ok := isInnerShortcodeCache.m[t.Name()] m, ok := isInnerShortcodeCache.m[t.Name()]
isInnerShortcodeCache.RUnlock() isInnerShortcodeCache.RUnlock()
if ok { if ok {
return m return m, nil
} }
isInnerShortcodeCache.Lock() isInnerShortcodeCache.Lock()
defer isInnerShortcodeCache.Unlock() defer isInnerShortcodeCache.Unlock()
if t.Tree == nil {
return false, errors.New("Template failed to compile")
}
match, _ := regexp.MatchString("{{.*?\\.Inner.*?}}", t.Tree.Root.String()) match, _ := regexp.MatchString("{{.*?\\.Inner.*?}}", t.Tree.Root.String())
isInnerShortcodeCache.m[t.Name()] = match isInnerShortcodeCache.m[t.Name()] = match
return match return match, nil
} }
func createShortcodePlaceholder(id int) string { func createShortcodePlaceholder(id int) string {
@ -344,14 +347,11 @@ Loop:
return sc, fmt.Errorf("Unable to locate template for shortcode '%s' in page %s", sc.name, p.BaseFileName()) return sc, fmt.Errorf("Unable to locate template for shortcode '%s' in page %s", sc.name, p.BaseFileName())
} }
// TODO(bep) Refactor/rename this lock strategy var err error
isInnerShortcodeCache.RLock() isInner, err = isInnerShortcode(tmpl)
if tmpl.Tree == nil { if err != nil {
isInnerShortcodeCache.RUnlock() return sc, fmt.Errorf("Failed to handle template for shortcode '%s' for page '%s': %s", sc.name, p.BaseFileName(), err)
return sc, fmt.Errorf("Template for shortcode '%s' failed to compile for page '%s'", sc.name, p.BaseFileName())
} }
isInnerShortcodeCache.RUnlock()
isInner = isInnerShortcode(tmpl)
case tScParam: case tScParam:
if !pt.isValueNext() { if !pt.isValueNext() {
@ -523,9 +523,6 @@ func renderShortcodeWithPage(tmpl *template.Template, data *ShortcodeWithPage) s
buffer := bp.GetBuffer() buffer := bp.GetBuffer()
defer bp.PutBuffer(buffer) defer bp.PutBuffer(buffer)
// TODO(bep) Refactor/rename this lock strategy
isInnerShortcodeCache.Lock()
defer isInnerShortcodeCache.Unlock()
err := tmpl.Execute(buffer, data) err := tmpl.Execute(buffer, data)
if err != nil { if err != nil {
jww.ERROR.Println("error processing shortcode", tmpl.Name(), "\n ERR:", err) jww.ERROR.Println("error processing shortcode", tmpl.Name(), "\n ERR:", err)