Chromium Code Reviews| Index: perf/server/perf.go |
| diff --git a/perf/server/perf.go b/perf/server/perf.go |
| index 0d12dc5dbf015296f7aab4d59f4647aa7e216160..eea99e01a783e380501e569fe215835f0fd525da 100644 |
| --- a/perf/server/perf.go |
| +++ b/perf/server/perf.go |
| @@ -30,7 +30,13 @@ var ( |
| // flags |
| var ( |
| - port = flag.String("port", ":8000", "HTTP service address (e.g., ':8000')") |
| + port = flag.String("port", ":8000", "HTTP service address (e.g., ':8000')") |
|
benchen
2014/06/13 19:51:29
I see tabs used in this file - is that fine?
jcgregorio
2014/06/13 19:54:01
Yes, Go is formatted with tabs.
On 2014/06/13 19:
|
| + doOauth = flag.Bool("oauth", true, "Run through the OAuth 2.0 flow on startup.") |
| + gitRepoDir = flag.String("git_repo_dir", "../../../skia", "Directory location for the Skia repo.") |
| +) |
| + |
| +var ( |
| + data *Data |
| ) |
| func init() { |
| @@ -100,18 +106,31 @@ func reportError(w http.ResponseWriter, r *http.Request, err error, message stri |
| func mainHandler(w http.ResponseWriter, r *http.Request) { |
| log.Printf("Main Handler: %q\n", r.URL.Path) |
| if r.Method == "GET" { |
| - w.Header().Set("Content-Type", "text/html") |
| - if err := indexTemplate.Execute(w, struct{}{}); err != nil { |
| - log.Println("ERROR: Failed to expand template:", err) |
| - } |
| + w.Header().Set("Content-Type", "text/plain") |
| + data.AsJSON(w) |
| + /* |
| + if err := indexTemplate.Execute(w, struct{}{}); err != nil { |
| + log.Println("ERROR: Failed to expand template:", err) |
| + } |
| + */ |
| } |
| } |
| func main() { |
| flag.Parse() |
| + |
| + log.Println("Begin loading data.") |
| + var err error |
| + data, err = NewData(*doOauth, *gitRepoDir) |
| + if err != nil { |
| + log.Fatalln("Failed initial load of data from BigQuery: ", err) |
| + } |
| + |
| // Resources are served directly. |
| http.Handle("/res/", autogzip.Handle(http.FileServer(http.Dir("./")))) |
| http.HandleFunc("/", autogzip.HandleFunc(mainHandler)) |
| + |
| + log.Println("Ready to serve.") |
| log.Fatal(http.ListenAndServe(*port, nil)) |
| } |