diff options
| author | Rob Pike <r@golang.org> | 2009-11-02 13:09:31 -0800 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-11-02 13:09:31 -0800 |
| commit | ba0f9cf5919fc73ad90cd267dfe44e4bb3695cb1 (patch) | |
| tree | 1e2942981dfcb2b0aad27d77e2f0fd46ef8ca04c /src/pkg/rpc/debug.go | |
| parent | cf5696fc2d629ff114531610e56834feb43b554e (diff) | |
| download | golang-ba0f9cf5919fc73ad90cd267dfe44e4bb3695cb1.tar.gz | |
remove goroutines from template parsing.
fix up one usage to take advantage.
R=rsc
CC=go-dev
http://go/go-review/1018023
Diffstat (limited to 'src/pkg/rpc/debug.go')
| -rw-r--r-- | src/pkg/rpc/debug.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go index f4ac8b4ab..fd6acf584 100644 --- a/src/pkg/rpc/debug.go +++ b/src/pkg/rpc/debug.go @@ -12,7 +12,6 @@ package rpc import ( "fmt"; "http"; - "os"; "sort"; "template"; ) @@ -37,7 +36,7 @@ const debugText = `<html> </body> </html>` -var debug *template.Template +var debug = template.MustParse(debugText, nil) type debugMethod struct { m *methodType; @@ -76,14 +75,6 @@ func (m methodArray) Swap(i, j int) { // Runs at /debug/rpc func debugHTTP(c *http.Conn, req *http.Request) { - var err os.Error; - if debug == nil { - debug, err = template.Parse(debugText, nil); - if err != nil { - fmt.Fprintln(c, "rpc can't create debug HTML template:", err.String()); - return; - } - } // Build a sorted version of the data. var services = make(serviceArray, len(server.serviceMap)); i := 0; @@ -100,7 +91,7 @@ func debugHTTP(c *http.Conn, req *http.Request) { } server.Unlock(); sort.Sort(services); - err = debug.Execute(services, c); + err := debug.Execute(services, c); if err != nil { fmt.Fprintln(c, "rpc: error executing template:", err.String()); } |