Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-05-07 20:59:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Separate tracker logic from the http package, step 1

Browse Source
This commit is contained in:
Justin Li
2014-07-17 00:09:56 -04:00
parent f8047ef8ab
commit da19ed3e21
21 changed files with 568 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
http/http.go
View File

@@ -13,45 +13,17 @@ import (
"github.com/julienschmidt/httprouter"
"github.com/stretchr/graceful"
"github.com/chihaya/bencode"
"github.com/chihaya/chihaya/config"
"github.com/chihaya/chihaya/drivers/backend"
"github.com/chihaya/chihaya/drivers/tracker"
"github.com/chihaya/chihaya/tracker"
)
type Tracker struct {
cfg *config.Config
pool tracker.Pool
backend backend.Conn
}
func NewTracker(cfg *config.Config) (*Tracker, error) {
tp, err := tracker.Open(&cfg.Tracker)
if err != nil {
return nil, err
}
bc, err := backend.Open(&cfg.Backend)
if err != nil {
return nil, err
}
go tracker.PurgeInactivePeers(
tp,
cfg.PurgeInactiveTorrents,
cfg.Announce.Duration*2,
cfg.Announce.Duration,
)
return &Tracker{
cfg: cfg,
pool: tp,
backend: bc,
}, nil
}
type ResponseHandler func(http.ResponseWriter, *http.Request, httprouter.Params) (int, error)
type Server struct {
config *config.Config
tracker *tracker.Tracker
}
func makeHandler(handler ResponseHandler) httprouter.Handle {
return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
start := time.Now()
@@ -73,47 +45,39 @@ func makeHandler(handler ResponseHandler) httprouter.Handle {
}
}
func NewRouter(t *Tracker, cfg *config.Config) *httprouter.Router {
func NewRouter(s *Server) *httprouter.Router {
r := httprouter.New()
if cfg.Private {
r.GET("/users/:passkey/announce", makeHandler(t.ServeAnnounce))
r.GET("/users/:passkey/scrape", makeHandler(t.ServeScrape))
if s.config.Private {
r.GET("/users/:passkey/announce", makeHandler(s.serveAnnounce))
r.GET("/users/:passkey/scrape", makeHandler(s.serveScrape))
r.PUT("/users/:passkey", makeHandler(t.putUser))
r.DELETE("/users/:passkey", makeHandler(t.delUser))
r.PUT("/users/:passkey", makeHandler(s.putUser))
r.DELETE("/users/:passkey", makeHandler(s.delUser))
} else {
r.GET("/announce", makeHandler(t.ServeAnnounce))
r.GET("/scrape", makeHandler(t.ServeScrape))
r.GET("/announce", makeHandler(s.serveAnnounce))
r.GET("/scrape", makeHandler(s.serveScrape))
}
if cfg.Whitelist {
r.PUT("/clients/:clientID", makeHandler(t.putClient))
r.DELETE("/clients/:clientID", makeHandler(t.delClient))
if s.config.Whitelist {
r.PUT("/clients/:clientID", makeHandler(s.putClient))
r.DELETE("/clients/:clientID", makeHandler(s.delClient))
}
r.GET("/torrents/:infohash", makeHandler(t.getTorrent))
r.PUT("/torrents/:infohash", makeHandler(t.putTorrent))
r.DELETE("/torrents/:infohash", makeHandler(t.delTorrent))
r.GET("/check", makeHandler(t.check))
r.GET("/torrents/:infohash", makeHandler(s.getTorrent))
r.PUT("/torrents/:infohash", makeHandler(s.putTorrent))
r.DELETE("/torrents/:infohash", makeHandler(s.delTorrent))
r.GET("/check", makeHandler(s.check))
return r
}
func Serve(cfg *config.Config) {
t, err := NewTracker(cfg)
if err != nil {
glog.Fatal("New: ", err)
func Serve(cfg *config.Config, tkr *tracker.Tracker) {
srv := &Server{
config: cfg,
tracker: tkr,
}
glog.V(0).Info("Starting on ", cfg.Addr)
graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, NewRouter(t, cfg))
}
func fail(w http.ResponseWriter, r *http.Request, err error) {
dict := bencode.NewDict()
dict["failure reason"] = err.Error()
bencoder := bencode.NewEncoder(w)
bencoder.Encode(dict)
graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, NewRouter(srv))
}