X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/fa5e7c1bccdf5c1ca1b05e0ef1f0e0478540ab51..d4039f6319ebf5b91bcbf3128d488dfc6f7be3c3:/server/server.go

diff --git a/server/server.go b/server/server.go
index bfe1066..a328785 100644
--- a/server/server.go
+++ b/server/server.go
@@ -2,10 +2,20 @@ package main
 
 import "container/list"
 import "encoding/json"
+import "expvar"
+import "flag"
 import "log"
 import "net/http"
+import "strconv"
 import "time"
 
+var port = flag.Int("port", 21059, "Port to listen on")
+
+var speak_count = expvar.NewInt("speak_count")
+var fetch_count = expvar.NewInt("fetch_count")
+var fetch_wait_count = expvar.NewInt("fetch_wait_count")
+var fetch_wake_count = expvar.NewInt("fetch_wake_count")
+
 type Message struct {
 	Time time.Time
 	Text string
@@ -28,23 +38,34 @@ func manage_store(store Store) {
 	message_count := 0
 	max_messages := 1000
 	waiting := list.New()
+main:
 	for {
 		select {
-		case new_message := <-store.Add:
-			messages.PushBack(new_message)
+		case new_message, ok := <-store.Add:
+			if !ok {
+				break main
+			}
+			speak_count.Add(1)
 			for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {
 				waiter.Value.(*StoreRequest).Messages <- []Message{*new_message}
 				close(waiter.Value.(*StoreRequest).Messages)
+				fetch_wake_count.Add(1)
 			}
 			waiting.Init()
+			messages.PushBack(new_message)
 			if message_count < max_messages {
 				message_count++
 			} else {
 				messages.Remove(messages.Front())
 			}
-		case request := <-store.Get:
+		case request, ok := <-store.Get:
+			if !ok {
+				break main
+			}
+			fetch_count.Add(1)
 			if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {
 				waiting.PushBack(request)
+				fetch_wait_count.Add(1)
 			} else {
 				start := messages.Back()
 				response_size := 1
@@ -103,7 +124,7 @@ func start_server(store Store) {
 		store.Add <- &Message{time.Now(), r.FormValue("text")}
 	})
 
-	log.Fatal(http.ListenAndServe(":8080", nil))
+	log.Fatal(http.ListenAndServe(":" + strconv.Itoa(*port), nil))
 }
 
 func main() {