From 3de57536933758738e5a0f1d513ee12e0ffaa4c4 Mon Sep 17 00:00:00 2001 From: thoeni Date: Sat, 29 Apr 2017 22:34:32 +0100 Subject: [PATCH] Clean-up --- circle.yml | 2 +- handlers.go | 24 +++++------------------- handlers_test.go | 31 ------------------------------- main.go | 9 +++++++++ service/tube-service.go | 9 --------- 5 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 handlers_test.go diff --git a/circle.yml b/circle.yml index b1758e6..d8385b2 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ test: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls override: - - go test -v -covermode=count -coverprofile=coverage.out + - go test ./... -v -covermode=count -coverprofile=coverage.out post: - goveralls -coverprofile=coverage.out -service=circle-ci -repotoken $COVERALLS_REPO_TOKEN diff --git a/handlers.go b/handlers.go index 06e201b..b1a7f6b 100644 --- a/handlers.go +++ b/handlers.go @@ -3,24 +3,15 @@ package main import ( "encoding/json" "fmt" - "log" - "net/http" - "strings" - "time" - "github.com/gorilla/mux" "github.com/gorilla/schema" - "github.com/thoeni/go-tfl" "github.com/thoeni/slack-tube-service/service" + "log" + "net/http" + "strings" ) -var client tfl.Client = &service.InMemoryCachedClient{ - tfl.NewClient(), - []tfl.Report{}, - time.Now().Add(-121 * time.Second), - float64(120), -} -var tubeService = service.TubeService{client} +var tubeService = service.TubeService{tflClient} func lineStatusHandler(w http.ResponseWriter, r *http.Request) { @@ -29,14 +20,12 @@ func lineStatusHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) tubeLine, _ := vars["line"] - log.Printf("Line requested: %s", tubeLine) var lines []string if tubeLine != "" { lines = []string{tubeLine} } reportsMap, err := tubeService.GetStatusFor(lines) - log.Printf("Client address is %p", &(tubeService.Client)) if err != nil { w.WriteHeader(http.StatusInternalServerError) if err := json.NewEncoder(w).Encode("There was an error getting information from TFL"); err != nil { @@ -51,8 +40,6 @@ func lineStatusHandler(w http.ResponseWriter, r *http.Request) { return } - log.Printf("Status size is: %d", len(reportsMap)) - w.WriteHeader(http.StatusOK) if err := json.NewEncoder(w).Encode(reportsMap); err != nil { log.Panic(err) @@ -84,7 +71,7 @@ func slackRequestHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) slackResp.ResponseType = "ephemeral" - slackResp.Text = fmt.Sprintf("Slack Tube Service - last updated at %s", lastStatusCheck.Format("15:04:05")) + slackResp.Text = fmt.Sprintf("Slack Tube Service") var lines []string if tubeLine != "" { @@ -92,7 +79,6 @@ func slackRequestHandler(w http.ResponseWriter, r *http.Request) { } reportsMap, err := tubeService.GetStatusFor(lines) - log.Printf("Client address is %p", &(tubeService.Client)) if err != nil { w.WriteHeader(http.StatusInternalServerError) diff --git a/handlers_test.go b/handlers_test.go deleted file mode 100644 index 170afd0..0000000 --- a/handlers_test.go +++ /dev/null @@ -1,31 +0,0 @@ -package main - -// -//import ( -// "io/ioutil" -// "net/http/httptest" -// "fmt" -// "testing" -// "net/http" -// "github.com/thoeni/go-tfl" -//) -// -//func TestLineStatusHandler(t *testing.T) { -// mockTflResponse, _ := ioutil.ReadFile(testDataCorrect) -// ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { -// w.Header().Set("Content-Type", "application/json") -// fmt.Fprintln(w, string(mockTflResponse)) -// })) -// defer ts.Close() -// client := tfl.NewClient() -// client.SetBaseURL(ts.URL + "/") -// -// statuses, err := client.GetTubeStatus() -// -// if err != nil { -// t.Error("Client failed to retrieve TFL data from mock server") -// } -// if len(statuses) != 11 { -// t.Error("Client retrieved and unmarshalled an incorrect number of statuses") -// } -//} diff --git a/main.go b/main.go index fceff4f..5f18397 100644 --- a/main.go +++ b/main.go @@ -9,6 +9,8 @@ import ( "github.com/boltdb/bolt" "github.com/rs/cors" + "github.com/thoeni/go-tfl" + "github.com/thoeni/slack-tube-service/service" ) var tokenStore tokenStorer @@ -18,6 +20,13 @@ var listenPort = os.Getenv("PORT") const defaultPort = "1123" +var tflClient = &service.InMemoryCachedClient{ + tfl.NewClient(), + []tfl.Report{}, + time.Now().Add(-121 * time.Second), + float64(120), +} + func init() { if listenPort == "" { diff --git a/service/tube-service.go b/service/tube-service.go index 79dd227..42d64f1 100644 --- a/service/tube-service.go +++ b/service/tube-service.go @@ -2,7 +2,6 @@ package service import ( "github.com/thoeni/go-tfl" - "log" "strings" "time" ) @@ -19,15 +18,12 @@ type InMemoryCachedClient struct { } func (c *InMemoryCachedClient) GetTubeStatus() ([]tfl.Report, error) { - log.Printf("Called GetTubeStatus on InMemoryCachedClient!") if time.Since(c.LastUpdated).Seconds() > c.InvalidateIntervalInSeconds { - log.Printf("Calling TFL...") r, e := c.Client.GetTubeStatus() c.TubeStatus = r c.LastUpdated = time.Now() return c.TubeStatus, e } - log.Printf("Returning cached value...") return c.TubeStatus, nil } @@ -40,16 +36,11 @@ func (s TubeService) GetStatusFor(lines []string) (map[string]tfl.Report, error) if err != nil { return nil, err } - log.Printf("Retrieved %d reports!", len(reports)) reportsMap := tfl.ReportArrayToMap(reports) - log.Printf("Mapped %d out of %d reports retrieved.", len(reportsMap), len(reports)) - log.Printf("Lines requested %d", len(lines)) if len(lines) == 0 { - log.Printf("Returning %d reports from the service.", len(reportsMap)) return reportsMap, nil } else { filteredReportsMap := filter(reportsMap, lines) - log.Printf("Returning %d filtered reports from the service.", len(filteredReportsMap)) return filteredReportsMap, nil } }