Shut down the message store after each test

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index a8b1c5334f3a778370d4ed58f00a1503fe3bb23e..7572447610372c8dd45c6c6dc063924df36bcecf 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -11,19 +11,14 @@ type Message struct {
        Text string
 }
 
        Text string
 }
 

-type FetchResponse struct {
-       Messages []Message
-       Time     time.Time
-}
-

 type StoreRequest struct {
        StartTime time.Time
        Messages  chan<- []Message
 }
 
 type Store struct {
 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
 }
 
 // TODO: Monotonic clock


@@ -33,13 +28,17 @@ func manage_store(store Store) {
        message_count := 0
        max_messages := 1000
        waiting := list.New()
        message_count := 0
        max_messages := 1000
        waiting := list.New()

+main:

        for {
                select {
        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() {
                        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 {
                        }
                        waiting.Init()
                        if message_count < max_messages {


@@ -47,24 +46,27 @@ func manage_store(store Store) {
                        } else {
                                messages.Remove(messages.Front())
                        }
                        } 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
                                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 {
                                        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() {
                                                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
                        }
                                }
                                request.Messages <- response_messages
                        }


@@ -73,18 +75,28 @@ func manage_store(store Store) {
 }
 
 func start_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
 }
 
 func start_server(store Store) {
        http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {
        go manage_store(store)
        return store
 }
 
 func start_server(store Store) {
        http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {

-               var since time.Time // TODO: Get start time from URL
+               var since time.Time
+               url_since := r.FormValue("since")
+               if url_since != "" {
+                       err := json.Unmarshal([]byte(url_since), &since)
+                       if err != nil {
+                               log.Print("fetch: parse since: ", err)
+                               w.WriteHeader(http.StatusBadRequest)
+                               w.Write([]byte("Could not parse since as date"))
+                               return
+                       }
+               }

                messages_from_store := make(chan []Message, 1)
                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)
                if err != nil {
                        log.Print("json encode: ", err)
                        w.WriteHeader(http.StatusInternalServerError)


@@ -95,8 +107,7 @@ func start_server(store Store) {
        })
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
        })
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {

-               text := "woof" // TODO: Get text from URL
-               store.Add <- Message{time.Now(), text}
+               store.Add <- &Message{time.Now(), r.FormValue("text")}

        })
 
        log.Fatal(http.ListenAndServe(":8080", nil))
        })
 
        log.Fatal(http.ListenAndServe(":8080", nil))