From d39a40c4fe89f8669b21db5faff77df74750ebb5 Mon Sep 17 00:00:00 2001
From: Justin Li <jli.justinli@gmail.com>
Date: Wed, 16 Jul 2014 11:29:40 -0400
Subject: [PATCH] Clearer field names for the Tracker struct

---
 http/announce.go              |  4 ++--
 http/announce_private_test.go |  2 +-
 http/api.go                   | 16 ++++++++--------
 http/http.go                  | 12 ++++++------
 http/scrape.go                |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/http/announce.go b/http/announce.go
index a2db6f8..15dde9c 100644
--- a/http/announce.go
+++ b/http/announce.go
@@ -24,7 +24,7 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
 		return http.StatusInternalServerError, err
 	}
 
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -87,7 +87,7 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
 
 	if t.cfg.Private {
 		delta := models.NewAnnounceDelta(ann, peer, user, torrent, created, snatched)
-		err = t.bc.RecordAnnounce(delta)
+		err = t.backend.RecordAnnounce(delta)
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}
diff --git a/http/announce_private_test.go b/http/announce_private_test.go
index c76f4b2..eb82f6f 100644
--- a/http/announce_private_test.go
+++ b/http/announce_private_test.go
@@ -66,7 +66,7 @@ func TestPrivateAnnounce(t *testing.T) {
 }
 
 func loadTestData(tkr *Tracker) error {
-	conn, err := tkr.tp.Get()
+	conn, err := tkr.pool.Get()
 	if err != nil {
 		return err
 	}
diff --git a/http/api.go b/http/api.go
index bd4109d..872de88 100644
--- a/http/api.go
+++ b/http/api.go
@@ -26,7 +26,7 @@ func (t *Tracker) check(w http.ResponseWriter, r *http.Request, p httprouter.Par
 }
 
 func (t *Tracker) getTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -65,7 +65,7 @@ func (t *Tracker) putTorrent(w http.ResponseWriter, r *http.Request, p httproute
 		return http.StatusBadRequest, err
 	}
 
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -79,7 +79,7 @@ func (t *Tracker) putTorrent(w http.ResponseWriter, r *http.Request, p httproute
 }
 
 func (t *Tracker) delTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -100,7 +100,7 @@ func (t *Tracker) delTorrent(w http.ResponseWriter, r *http.Request, p httproute
 }
 
 func (t *Tracker) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -134,7 +134,7 @@ func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 		return http.StatusBadRequest, err
 	}
 
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -148,7 +148,7 @@ func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 }
 
 func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -164,7 +164,7 @@ func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 }
 
 func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -178,7 +178,7 @@ func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter
 }
 
 func (t *Tracker) delClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
diff --git a/http/http.go b/http/http.go
index ad4232c..49bcf2d 100644
--- a/http/http.go
+++ b/http/http.go
@@ -20,9 +20,9 @@ import (
 )
 
 type Tracker struct {
-	cfg *config.Config
-	tp  tracker.Pool
-	bc  backend.Conn
+	cfg     *config.Config
+	pool    tracker.Pool
+	backend backend.Conn
 }
 
 func NewTracker(cfg *config.Config) (*Tracker, error) {
@@ -37,9 +37,9 @@ func NewTracker(cfg *config.Config) (*Tracker, error) {
 	}
 
 	return &Tracker{
-		cfg: cfg,
-		tp:  tp,
-		bc:  bc,
+		cfg:     cfg,
+		pool:    tp,
+		backend: bc,
 	}, nil
 }
 
diff --git a/http/scrape.go b/http/scrape.go
index 6c8f11a..b1135b2 100644
--- a/http/scrape.go
+++ b/http/scrape.go
@@ -23,7 +23,7 @@ func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprout
 		return http.StatusInternalServerError, err
 	}
 
-	conn, err := t.tp.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}