glide up

2017-05-18 18:54:23 +02:00
parent dc386661ca
commit 5448f25fd6
645 changed files with 55908 additions and 33297 deletions
--- a/vendor/golang.org/x/net/trace/events.go
+++ b/vendor/golang.org/x/net/trace/events.go
@@ -21,6 +21,11 @@ import (
 	"time"
 )

+var eventsTmpl = template.Must(template.New("events").Funcs(template.FuncMap{
+	"elapsed":   elapsed,
+	"trimSpace": strings.TrimSpace,
+}).Parse(eventsHTML))
+
 const maxEventsPerLog = 100

 type bucket struct {
@@ -96,7 +101,7 @@ func RenderEvents(w http.ResponseWriter, req *http.Request, sensitive bool) {

 	famMu.RLock()
 	defer famMu.RUnlock()
-	if err := eventsTmpl().Execute(w, data); err != nil {
+	if err := eventsTmpl.Execute(w, data); err != nil {
 		log.Printf("net/trace: Failed executing template: %v", err)
 	}
 }
@@ -416,19 +421,6 @@ func freeEventLog(el *eventLog) {
 	}
 }

-var eventsTmplCache *template.Template
-var eventsTmplOnce sync.Once
-
-func eventsTmpl() *template.Template {
-	eventsTmplOnce.Do(func() {
-		eventsTmplCache = template.Must(template.New("events").Funcs(template.FuncMap{
-			"elapsed":   elapsed,
-			"trimSpace": strings.TrimSpace,
-		}).Parse(eventsHTML))
-	})
-	return eventsTmplCache
-}
-
 const eventsHTML = `
 <html>
 	<head>