Switch to using defer to clean up after tests

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index 695ec10ecfccb578c702618dc807ff9f2666efd3..0c40784ed7b4efb657bd55b798c58f0366991a2b 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -28,11 +28,13 @@ import "time"
 
 var port = flag.Int("port", 21059, "Port to listen on")
 var localaddress = flag.String("localaddress", "", "Local address to bind to")
 
 var port = flag.Int("port", 21059, "Port to listen on")
 var localaddress = flag.String("localaddress", "", "Local address to bind to")

+var max_messages = flag.Int("maxmessages", 1000, "Maximum number of messages to retain")

 
 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")
 
 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")

+var drop_due_to_limit_count = expvar.NewInt("drop_due_to_limit_count")

 
 type Message struct {
        Time time.Time
 
 type Message struct {
        Time time.Time


@@ -55,7 +57,6 @@ type Store struct {
 func manage_store(store Store) {
        messages := list.New()
        message_count := 0
 func manage_store(store Store) {
        messages := list.New()
        message_count := 0

-       max_messages := 1000

        waiting := list.New()
 main:
        for {
        waiting := list.New()
 main:
        for {


@@ -72,10 +73,11 @@ main:
                        }
                        waiting.Init()
                        messages.PushBack(new_message)
                        }
                        waiting.Init()
                        messages.PushBack(new_message)

-                       if message_count < max_messages {
+                       if message_count < *max_messages {

                                message_count++
                        } else {
                                messages.Remove(messages.Front())
                                message_count++
                        } else {
                                messages.Remove(messages.Front())

+                               drop_due_to_limit_count.Add(1)

                        }
                case request, ok := <-store.Get:
                        if !ok {
                        }
                case request, ok := <-store.Get:
                        if !ok {


@@ -152,7 +154,7 @@ func start_server(store Store) {
        })
 
        http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
        })
 
        http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {

-               w.Write([]byte(robots_txt));
+               w.Write([]byte(robots_txt))

        })
 
        log.Fatal(http.ListenAndServe(*localaddress+":"+strconv.Itoa(*port), nil))
        })
 
        log.Fatal(http.ListenAndServe(*localaddress+":"+strconv.Itoa(*port), nil))