Don't send empty messages

[reliable-chat] / server / server.go

diff --git a/server/server.go b/server/server.go
index 7572447610372c8dd45c6c6dc063924df36bcecf..8dce69be6d77cfbbae9d73e9d96bfac4f9215445 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -1,13 +1,45 @@
+/*  reliable-chat - multipath chat
+ *  Copyright (C) 2012  Scott Worley <sworley@chkno.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+

 package main
 
 import "container/list"
 import "encoding/json"
 package main
 
 import "container/list"
 import "encoding/json"

+import "expvar"
+import "flag"

 import "log"
 import "net/http"
 import "log"
 import "net/http"

+import "strconv"

 import "time"
 
 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 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
 type Message struct {
        Time time.Time

+       ID   string

        Text string
 }
 
        Text string
 }
 


@@ -26,7 +58,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 {


@@ -35,23 +66,28 @@ main:
                        if !ok {
                                break main
                        }
                        if !ok {
                                break main
                        }

-                       messages.PushBack(new_message)
+                       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)
                        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()
                        }
                        waiting.Init()

-                       if message_count < max_messages {
+                       messages.PushBack(new_message)
+                       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 {
                                break main
                        }
                        }
                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)
                        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
                        } else {
                                start := messages.Back()
                                response_size := 1


@@ -80,6 +116,10 @@ func start_store() Store {
        return store
 }
 
        return store
 }
 

+const robots_txt = `User-agent: *
+Disallow: /
+`
+

 func start_server(store Store) {
        http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {
                var since time.Time
 func start_server(store Store) {
        http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {
                var since time.Time


@@ -103,17 +143,27 @@ func start_server(store Store) {
                        return
                }
                w.Header().Add("Content-Type", "application/json")
                        return
                }
                w.Header().Add("Content-Type", "application/json")

+               w.Header().Add("Access-Control-Allow-Origin", "*")

                w.Write(json_encoded)
        })
 
        http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
                w.Write(json_encoded)
        })
 
        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("id"),
+                       r.FormValue("text")}
+       })
+
+       http.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
+               w.Write([]byte(robots_txt))

        })
 
        })
 

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

 }
 
 func main() {
 }
 
 func main() {

+       flag.Parse()
+       start_time.Set(time.Now().UnixNano())

        store := start_store()
        start_server(store)
 }
        store := start_store()
        start_server(store)
 }