MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-26 22:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable domain based routing for now

Browse Source
This commit is contained in:
Harshavardhana 2015-04-30 21:15:53 -07:00
parent f3078d047c
commit bbc32d6ac0
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -93,11 +93,11 @@ EXAMPLES:
} }
var flags = []cli.Flag{ var flags = []cli.Flag{
cli.StringFlag{ // cli.StringFlag{
Name: "domain", // Name: "domain",
Value: "", // Value: "",
Usage: "domain used for routing incoming API requests", // Usage: "domain used for routing incoming API requests",
}, // },
cli.StringFlag{ cli.StringFlag{
Name: "api-address", Name: "api-address",
Value: ":9000", Value: ":9000",
@ -191,7 +191,7 @@ func getAPIServerConfig(c *cli.Context) httpserver.Config {
} }
tls := (certFile != "" && keyFile != "") tls := (certFile != "" && keyFile != "")
return httpserver.Config{ return httpserver.Config{
Domain: c.GlobalString("domain"), // Domain: c.GlobalString("domain"),
Address: c.GlobalString("api-address"), Address: c.GlobalString("api-address"),
TLS: tls, TLS: tls,
CertFile: certFile, CertFile: certFile,
@ -201,7 +201,7 @@ func getAPIServerConfig(c *cli.Context) httpserver.Config {
func getWebServerConfigFunc(c *cli.Context) server.StartServerFunc { func getWebServerConfigFunc(c *cli.Context) server.StartServerFunc {
config := httpserver.Config{ config := httpserver.Config{
Domain: c.GlobalString("domain"), // Domain: c.GlobalString("domain"),
Address: c.GlobalString("web-address"), Address: c.GlobalString("web-address"),
TLS: false, TLS: false,
CertFile: "", CertFile: "",

8
pkg/api/api_router.go
View File

@ -47,6 +47,7 @@ func pathMux(api minioAPI, mux *router.Router) *router.Router {
return mux return mux
} }
/*
// Domain based routing // Domain based routing
func domainMux(api minioAPI, mux *router.Router) *router.Router { func domainMux(api minioAPI, mux *router.Router) *router.Router {
mux.HandleFunc("/", mux.HandleFunc("/",
@ -63,15 +64,16 @@ func domainMux(api minioAPI, mux *router.Router) *router.Router {
return mux return mux
} }
*/
// Get proper router based on domain availability // Get proper router based on domain availability
func getMux(api minioAPI, mux *router.Router) *router.Router { func getMux(api minioAPI, mux *router.Router) *router.Router {
switch true { switch true {
case api.domain == "": case api.domain == "":
return pathMux(api, mux) return pathMux(api, mux)
case api.domain != "": // case api.domain != "":
s := mux.Host(api.domain).Subrouter() // s := mux.Host(api.domain).Subrouter()
return domainMux(api, s) // return domainMux(api, s)
} }
return nil return nil
} }

2
pkg/server/httpserver/httpserver.go
View File

@ -29,7 +29,7 @@ type Config struct {
CertFile string CertFile string
KeyFile string KeyFile string
Websocket bool // TODO Websocket bool // TODO
Domain string // Domain string
} }
// Server - http server related // Server - http server related

5
pkg/server/server.go
View File

@ -41,7 +41,8 @@ type MemoryFactory struct {
func (f MemoryFactory) GetStartServerFunc() StartServerFunc { func (f MemoryFactory) GetStartServerFunc() StartServerFunc {
return func() (chan<- string, <-chan error) { return func() (chan<- string, <-chan error) {
_, _, driver := memory.Start(f.MaxMemory, 1*time.Hour) _, _, driver := memory.Start(f.MaxMemory, 1*time.Hour)
ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config) //ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
ctrl, status, _ := httpserver.Start(api.HTTPHandler("", driver), f.Config)
return ctrl, status return ctrl, status
} }
} }
@ -69,7 +70,7 @@ type DonutFactory struct {
func (f DonutFactory) GetStartServerFunc() StartServerFunc { func (f DonutFactory) GetStartServerFunc() StartServerFunc {
return func() (chan<- string, <-chan error) { return func() (chan<- string, <-chan error) {
_, _, driver := donut.Start(f.Paths) _, _, driver := donut.Start(f.Paths)
ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config) ctrl, status, _ := httpserver.Start(api.HTTPHandler("", driver), f.Config)
return ctrl, status return ctrl, status
} }
} }