LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Put the query package into http, since it is for http only

Browse source
This commit is contained in:
Justin Li 2014-07-17 01:00:26 -04:00
parent 343b3358a1
commit 3ad3f11b2c
5 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
http/http.go
View file

@ -45,7 +45,7 @@ func makeHandler(handler ResponseHandler) httprouter.Handle {
} }
} }
func NewRouter(s *Server) *httprouter.Router { func newRouter(s *Server) *httprouter.Router {
r := httprouter.New() r := httprouter.New()
if s.config.Private { if s.config.Private {
@ -79,5 +79,5 @@ func Serve(cfg *config.Config, tkr *tracker.Tracker) {
} }
glog.V(0).Info("Starting on ", cfg.Addr) glog.V(0).Info("Starting on ", cfg.Addr)
graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, NewRouter(srv)) graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, newRouter(srv))
} }

2
http/http_test.go
View file

@ -36,7 +36,7 @@ func createServer(tkr *tracker.Tracker, cfg *config.Config) (*httptest.Server, e
config: cfg, config: cfg,
tracker: tkr, tracker: tkr,
} }
return httptest.NewServer(NewRouter(srv)), nil return httptest.NewServer(newRouter(srv)), nil
} }
func announce(p params, srv *httptest.Server) ([]byte, error) { func announce(p params, srv *httptest.Server) ([]byte, error) {

0
models/query/query.go → http/query/query.go
View file

0
models/query/query_test.go → http/query/query_test.go
View file

2
http/tracker.go
View file

@ -10,7 +10,7 @@ import (
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/chihaya/chihaya/config" "github.com/chihaya/chihaya/config"
"github.com/chihaya/chihaya/models/query" "github.com/chihaya/chihaya/http/query"
"github.com/chihaya/chihaya/tracker/models" "github.com/chihaya/chihaya/tracker/models"
) )