X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/87ac1d98245de076b321b149cf8c36795f4425e6..c282d87802c8a36e1ef5e4b367e7e753c2ba05f5:/server/server.go?ds=sidebyside

diff --git a/server/server.go b/server/server.go
index 8c8a989..7572447 100644
--- a/server/server.go
+++ b/server/server.go
@@ -11,19 +11,14 @@ type Message struct {
 	Text string
 }
 
-type FetchResponse struct {
-	Messages []Message
-	Time     time.Time
-}
-
 type StoreRequest struct {
 	StartTime time.Time
 	Messages  chan<- []Message
 }
 
 type Store struct {
-	Add chan Message
-	Get chan StoreRequest
+	Add chan *Message
+	Get chan *StoreRequest
 }
 
 // TODO: Monotonic clock
@@ -33,13 +28,17 @@ func manage_store(store Store) {
 	message_count := 0
 	max_messages := 1000
 	waiting := list.New()
+main:
 	for {
 		select {
-		case new_message := <-store.Add:
+		case new_message, ok := <-store.Add:
+			if !ok {
+				break main
+			}
 			messages.PushBack(new_message)
 			for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {
-				waiter.Value.(StoreRequest).Messages <- []Message{new_message}
-				close(waiter.Value.(StoreRequest).Messages)
+				waiter.Value.(*StoreRequest).Messages <- []Message{*new_message}
+				close(waiter.Value.(*StoreRequest).Messages)
 			}
 			waiting.Init()
 			if message_count < max_messages {
@@ -47,24 +46,27 @@ func manage_store(store Store) {
 			} else {
 				messages.Remove(messages.Front())
 			}
-		case request := <-store.Get:
-			if messages.Back() == nil || request.StartTime.After(messages.Back().Value.(Message).Time) {
+		case request, ok := <-store.Get:
+			if !ok {
+				break main
+			}
+			if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {
 				waiting.PushBack(request)
 			} else {
 				start := messages.Back()
 				response_size := 1
-				if messages.Front().Value.(Message).Time.After(request.StartTime) {
+				if messages.Front().Value.(*Message).Time.After(request.StartTime) {
 					start = messages.Front()
 					response_size = message_count
 				} else {
-					for start.Prev().Value.(Message).Time.After(request.StartTime) {
+					for start.Prev().Value.(*Message).Time.After(request.StartTime) {
 						start = start.Prev()
 						response_size++
 					}
 				}
 				response_messages := make([]Message, 0, response_size)
 				for m := start; m != nil; m = m.Next() {
-					response_messages = append(response_messages, m.Value.(Message))
+					response_messages = append(response_messages, *m.Value.(*Message))
 				}
 				request.Messages <- response_messages
 			}
@@ -73,7 +75,7 @@ func manage_store(store Store) {
 }
 
 func start_store() Store {
-	store := Store{make(chan Message, 20), make(chan StoreRequest, 20)}
+	store := Store{make(chan *Message, 20), make(chan *StoreRequest, 20)}
 	go manage_store(store)
 	return store
 }
@@ -92,9 +94,9 @@ func start_server(store Store) {
 			}
 		}
 		messages_from_store := make(chan []Message, 1)
-		store.Get <- StoreRequest{since, messages_from_store}
+		store.Get <- &StoreRequest{since, messages_from_store}
 
-		json_encoded, err := json.Marshal(FetchResponse{<-messages_from_store, time.Now()})
+		json_encoded, err := json.Marshal(<-messages_from_store)
 		if err != nil {
 			log.Print("json encode: ", err)
 			w.WriteHeader(http.StatusInternalServerError)
@@ -105,7 +107,7 @@ func start_server(store Store) {
 	})
 
 	http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
-		store.Add <- Message{time.Now(), r.FormValue("text")}
+		store.Add <- &Message{time.Now(), r.FormValue("text")}
 	})
 
 	log.Fatal(http.ListenAndServe(":8080", nil))