barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't rename imports unless necessary

Browse source
This commit is contained in:
kortschak 2014-06-26 09:20:22 +09:30
parent 0c9de61413
commit d37c6caa8e
7 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
http/cayley_http.go
View file

@ -23,7 +23,7 @@ import (
"github.com/barakmich/glog"
"github.com/julienschmidt/httprouter"
cfg "github.com/google/cayley/config"
"github.com/google/cayley/config"
"github.com/google/cayley/graph"
)
@ -71,7 +71,7 @@ func (h *TemplateRequestHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
}
type Api struct {
config *cfg.CayleyConfig
config *config.CayleyConfig
ts graph.TripleStore
}
@ -84,7 +84,7 @@ func (api *Api) ApiV1(r *httprouter.Router) {
r.POST("/api/v1/delete", LogRequest(api.ServeV1Delete))
}
func SetupRoutes(ts graph.TripleStore, config *cfg.CayleyConfig) {
func SetupRoutes(ts graph.TripleStore, config *config.CayleyConfig) {
r := httprouter.New()
var templates = template.Must(template.ParseGlob("templates/*.tmpl"))
templates.ParseGlob("templates/*.html")
@ -102,7 +102,7 @@ func SetupRoutes(ts graph.TripleStore, config *cfg.CayleyConfig) {
http.Handle("/", r)
}
func CayleyHTTP(ts graph.TripleStore, config *cfg.CayleyConfig) {
func CayleyHTTP(ts graph.TripleStore, config *config.CayleyConfig) {
SetupRoutes(ts, config)
glog.Infof("Cayley now listening on %s:%s\n", config.ListenHost, config.ListenPort)
fmt.Printf("Cayley now listening on %s:%s\n", config.ListenHost, config.ListenPort)