Start loading the BigQuery data and serving it to the UI.

perf/server/perf.go

+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be found
+// in the LICENSE file.
+
 package main
 
 import (
         "database/sql"
         "flag"
         "fmt"
         "html/template"
         "io/ioutil"
         "log"
         "math/rand"
@@ skipping 12 matching lines @@
 var (
         // indexTemplate is the main index.html page we serve.
         indexTemplate *template.Template = nil
 
         // db is the database, nil if we don't have an SQL database to store data into.
         db *sql.DB = nil
 )
 
 // flags
 var (
-        port = flag.String("port", ":8000", "HTTP service address (e.g., ':8000')")
+        port       = flag.String("port", ":8000", "HTTP service address (e.g., ':8000')")
+        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

[mtklein, 2014/06/15 15:12:12]

Having data global smells a little to me.  I think I'd have expected it scoped
to main, and closed over when creating the JSON handler.  Something like this?

func jsonHandler(data *Data, w http.ResponseWriter, r *http.Request) { ... }

func main() { 
  ...
  data, err := NewData(...)
  ...
  http.HandleFunc("/json", autogzip.HandleFunc(func(w http.ResponseWriter, r
*http.Request) { jsonHandler(data, w, r) }))

[jcgregorio, 2014/06/16 02:46:25]

Data will be protected with a Mutex once the auto update code is added. Also, it
isn't really global as it is scoped to package 'main', the code just hasn't
grown to the point of needing more than a single package yet.

On 2014/06/15 15:12:12, mtklein wrote:

 )
 
 func init() {
         rand.Seed(time.Now().UnixNano())
 
         // Change the current working directory to the directory of the executable.
         var err error
         cwd, err := filepath.Abs(filepath.Dir(os.Args[0]))
         if err != nil {
                 log.Fatalln(err)
@@ skipping 45 matching lines @@
         }()
 }
 
 // reportError formats an HTTP error response and also logs the detailed error message.
 func reportError(w http.ResponseWriter, r *http.Request, err error, message string) {
         log.Println("Error:", message, err)
         w.Header().Set("Content-Type", "text/plain")
         http.Error(w, message, 500)
 }
 
+// jsonHandler handles the GET for the JSON requests.
+func jsonHandler(w http.ResponseWriter, r *http.Request) {
+        log.Printf("Main Handler: %q\n", r.URL.Path)

[mtklein, 2014/06/15 15:12:12]

-> JSON Handler: ?

[jcgregorio, 2014/06/16 02:46:25]

Done.

[jcgregorio, 2014/06/16 02:46:25]

Done.

+        if r.Method == "GET" {
+                w.Header().Set("Content-Type", "application/json")
+                data.AsJSON(w)
+        }
+}
+
 // mainHandler handles the GET and POST of the main page.
 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)
                 }
         }
 }
 
 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))
+        http.HandleFunc("/json/", autogzip.HandleFunc(jsonHandler))
+
+        log.Println("Ready to serve.")
         log.Fatal(http.ListenAndServe(*port, nil))
 }