MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-10 05:59:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to move config handling into api/

Browse Source
This commit is contained in:
Harshavardhana
2015-03-18 22:49:02 -07:00
parent b61daa0f87
commit a1baed3bbc
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/api/api_router.go
View File

@@ -20,9 +20,9 @@ import (
"log"
"net/http"
x "github.com/gorilla/mux"
router "github.com/gorilla/mux"
"github.com/minio-io/minio/pkg/api/config"
mstorage "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/utils/config"
)
// private use
@@ -32,7 +32,7 @@ type minioAPI struct {
}
// Path based routing
func pathMux(api minioAPI, mux *x.Router) *x.Router {
func pathMux(api minioAPI, mux *router.Router) *router.Router {
mux.HandleFunc("/", api.listBucketsHandler).Methods("GET")
mux.HandleFunc("/{bucket}", api.listObjectsHandler).Methods("GET")
mux.HandleFunc("/{bucket}", api.putBucketHandler).Methods("PUT")
@@ -44,7 +44,7 @@ func pathMux(api minioAPI, mux *x.Router) *x.Router {
}
// Domain based routing
func domainMux(api minioAPI, mux *x.Router) *x.Router {
func domainMux(api minioAPI, mux *router.Router) *router.Router {
mux.HandleFunc("/",
api.listObjectsHandler).Host("{bucket}" + "." + api.domain).Methods("GET")
mux.HandleFunc("/{object:.*}",
@@ -60,7 +60,7 @@ func domainMux(api minioAPI, mux *x.Router) *x.Router {
}
// Get proper router based on domain availability
func getMux(api minioAPI, mux *x.Router) *x.Router {
func getMux(api minioAPI, mux *router.Router) *router.Router {
switch true {
case api.domain == "":
return pathMux(api, mux)
@@ -73,12 +73,12 @@ func getMux(api minioAPI, mux *x.Router) *x.Router {
// HTTPHandler - http wrapper handler
func HTTPHandler(domain string, storage mstorage.Storage) http.Handler {
var mux *x.Router
var mux *router.Router
var api = minioAPI{}
api.storage = storage
api.domain = domain
r := x.NewRouter()
r := router.NewRouter()
mux = getMux(api, r)
var conf = config.Config{}