Merge skitch's changes.

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index 5c5ef50fbfd448989c3b57648f466e76ede087fa..9ca5e619c1a9d18cd53981af2157458e7caa5cac 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -11,6 +11,7 @@ import "time"
 
 var port = flag.Int("port", 21059, "Port to listen on")
 
+var frame_count = expvar.NewInt("frame_count")
 var speak_count = expvar.NewInt("speak_count")
 var fetch_count = expvar.NewInt("fetch_count")
 var fetch_wait_count = expvar.NewInt("fetch_wait_count")
@@ -160,6 +161,7 @@ func start_server(store Store) {
                        return
                }
                w.Header().Add("Content-Type", "application/json")
+               w.Header().Add("Access-Control-Allow-Origin", "*")
                w.Write(json_encoded)
        })
 
@@ -171,6 +173,7 @@ func start_server(store Store) {
        })
 
        http.HandleFunc("/frame", func(w http.ResponseWriter, r *http.Request) {
+               frame_count.Add(1)
                w.Write([]byte(frame_html));
        })
 
@@ -178,6 +181,7 @@ func start_server(store Store) {
 }
 
 func main() {
+       flag.Parse()
        store := start_store()
        start_server(store)
 }