Implement index endpoint

Springest · Oct 11, 2015 · 730dd27 · 730dd27
1 parent 3a949f1
commit 730dd27
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 6 deletions.
diff --git a/create.sh b/create.sh
@@ -0,0 +1 @@
+psql notifier -f schema.sql
diff --git a/drop.sh b/drop.sh
@@ -0,0 +1,2 @@
+psql notifier -c "drop table incoming";
+psql notifier -c "drop table notifiers";
diff --git a/email.go b/email.go
@@ -57,7 +57,7 @@ func sendEmail(class string, data []byte) {
 	// already experienced a connection reset by peer locally
 }
 
-func sendEmailNotification(s *Stat, notifier *dbNotifier) {
+func sendEmailNotification(s *Stat, notifier *Notifier) {
 	var err error
 	var doc bytes.Buffer
 

diff --git a/endpoints.go b/endpoints.go
@@ -2,11 +2,50 @@ package main
 
 import (
 	"encoding/json"
+	"html/template"
 	"log"
 	"net/http"
+	"time"
 )
 
+func trackTime(start time.Time, name string) {
+	elapsed := time.Since(start)
+	log.Printf("%s took %s\n", name, elapsed)
+}
+
+func handleIndex(w http.ResponseWriter, r *http.Request) {
+	defer trackTime(time.Now(), "handleIndex")
+	defer r.Body.Close()
+
+	t, err := template.ParseFiles("templates/index.html")
+	if err != nil {
+		log.Fatal("ParseFiles", err)
+	}
+
+	notifiers := []Notifier{}
+	err = db.Select(&notifiers, "SELECT * FROM notifiers")
+	if err != nil {
+		log.Fatal("db.Select notifiers ", err)
+	}
+
+	incoming := []Incoming{}
+	err = db.Select(&incoming, "SELECT * FROM incoming ORDER BY id desc")
+	if err != nil {
+		log.Fatal("db.Select incoming ", err)
+	}
+
+	data := map[string]interface{}{
+		"notifiers": notifiers,
+		"incoming":  incoming,
+	}
+	err = t.Execute(w, data)
+	if err != nil {
+		log.Fatal("t.Execute", err)
+	}
+}
+
 func handleCount(w http.ResponseWriter, r *http.Request) {
+	defer trackTime(time.Now(), "handleCount")
 	defer r.Body.Close()
 
 	count := countRows()

diff --git a/run.sh b/run.sh
@@ -1 +1 @@
-go run *.go
+go run udp_listener.go slack.go email.go endpoints.go
diff --git a/slack.go b/slack.go
@@ -10,7 +10,7 @@ import (
 	"text/template"
 )
 
-func sendSlackNotification(s *Stat, notifier *dbNotifier) {
+func sendSlackNotification(s *Stat, notifier *Notifier) {
 	var err error
 	var doc bytes.Buffer
 

diff --git a/templates/index.html b/templates/index.html
@@ -0,0 +1,41 @@
+<html>
+  <head>
+  </head>
+  <body>
+    Notifiers:
+    <table>
+      <tr>
+        <th>id</th>
+        <th>type</th>
+        <th>class</th>
+        <th>template</th>
+      </tr>
+      {{range $notifier := .notifiers}}</td>
+        <tr>
+          <td>{{$notifier.Id}}</td>
+          <td>{{$notifier.NotificationType}}</td>
+          <td>{{$notifier.Class}}</td>
+          <td style="background: red;">{{$notifier.Template}}</td>
+        </tr>
+      {{ end }}
+    </table>
+
+    Latest incoming items:
+    <table>
+      <tr>
+        <th>id</th>
+        <th>class</th>
+        <th>received at</th>
+        <th>data</th>
+      </tr>
+      {{range $item := .incoming}}</td>
+        <tr>
+          <td>{{$item.Id}}</td>
+          <td>{{$item.Class}}</td>
+          <td>{{$item.ReceivedAt}}</td>
+          <td>{{$item.FormattedData}}</td>
+        </tr>
+      {{ end }}
+    </table>
+  </body>
+</html>
diff --git a/udp_listener.go b/udp_listener.go
@@ -21,7 +21,7 @@ type Stat struct {
 	Value types.JsonText `json:"value"`
 }
 
-type dbNotifier struct {
+type Notifier struct {
 	Id               int    `db:"id"`
 	NotificationType string `db:"notification_type"`
 	Class            string `db:"class"`
@@ -30,6 +30,17 @@ type dbNotifier struct {
 	// email address, slack channel, phone number, how to store?
 }
 
+type Incoming struct {
+	Id         int       `db:"id"`
+	Class      string    `db:"class"`
+	ReceivedAt time.Time `db:"received_at"`
+	Data       string    `db:"data"`
+}
+
+func (i *Incoming) FormattedData() string {
+	return string(i.Data)
+}
+
 func (s *Stat) toMap() map[string]interface{} {
 	m := map[string]interface{}{}
 	s.Value.Unmarshal(&m)
@@ -47,7 +58,7 @@ func (s *Stat) persist() {
 }
 
 func (s *Stat) notify() {
-	notifiers := []dbNotifier{}
+	notifiers := []Notifier{}
 	err := db.Select(&notifiers, "SELECT * FROM notifiers WHERE class=$1", s.Key)
 	if err != nil {
 		log.Fatal("db.Select ", err)
@@ -110,7 +121,7 @@ func main() {
 	}
 
 	go listenToUDP(conn)
-	// http.HandleFunc("/", handleIndex)
+	http.HandleFunc("/", handleIndex)
 	http.HandleFunc("/v1/count", handleCount)
 
 	db, err = sqlx.Connect("postgres", "user=markmulder dbname=notifier sslmode=disable")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		psql notifier -c "drop table incoming";
		psql notifier -c "drop table notifiers";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		go run *.go
		go run udp_listener.go slack.go email.go endpoints.go