X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/270d2ae5829e1d66dcc1a0fb78ba3c2e3c3c22de..c301e690609e79727844622d29a0931267a27de4:/server/server.go diff --git a/server/server.go b/server/server.go index adbbf84..8dce69b 100644 --- a/server/server.go +++ b/server/server.go @@ -28,12 +28,14 @@ import "time" 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 frame_count = expvar.NewInt("frame_count") +var start_time = expvar.NewInt("start_time") 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 @@ -56,7 +58,6 @@ type Store struct { func manage_store(store Store) { messages := list.New() message_count := 0 - max_messages := 1000 waiting := list.New() main: for { @@ -73,10 +74,11 @@ main: } waiting.Init() messages.PushBack(new_message) - if message_count < max_messages { + if message_count < *max_messages { message_count++ } else { messages.Remove(messages.Front()) + drop_due_to_limit_count.Add(1) } case request, ok := <-store.Get: if !ok { @@ -114,49 +116,6 @@ func start_store() Store { return store } -const frame_html = ` - - - - - - - - -` - const robots_txt = `User-agent: * Disallow: / ` @@ -195,13 +154,8 @@ func start_server(store Store) { r.FormValue("text")} }) - http.HandleFunc("/frame", func(w http.ResponseWriter, r *http.Request) { - frame_count.Add(1) - w.Write([]byte(frame_html)); - }) - 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)) @@ -209,6 +163,7 @@ func start_server(store Store) { func main() { flag.Parse() + start_time.Set(time.Now().UnixNano()) store := start_store() start_server(store) }