MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-28 08:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #479 from fkautz/pr_out_simplifying_server_config_handling

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-04-23 16:13:39 -07:00
commit c75b9d58f5
3 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
main.go
View File

@ -34,7 +34,6 @@ import (
"github.com/minio-io/minio/pkg/api" "github.com/minio-io/minio/pkg/api"
"github.com/minio-io/minio/pkg/api/web" "github.com/minio-io/minio/pkg/api/web"
"github.com/minio-io/minio/pkg/iodine" "github.com/minio-io/minio/pkg/iodine"
"github.com/minio-io/minio/pkg/server"
"github.com/minio-io/minio/pkg/server/httpserver" "github.com/minio-io/minio/pkg/server/httpserver"
"github.com/minio-io/minio/pkg/storage/drivers/donut" "github.com/minio-io/minio/pkg/storage/drivers/donut"
"github.com/minio-io/minio/pkg/storage/drivers/memory" "github.com/minio-io/minio/pkg/storage/drivers/memory"
@ -101,56 +100,38 @@ EXAMPLES:
} }
type memoryFactory struct { type memoryFactory struct {
server.Config httpserver.Config
maxMemory uint64 maxMemory uint64
} }
func (f memoryFactory) getStartServerFunc() startServerFunc { func (f memoryFactory) getStartServerFunc() startServerFunc {
return func() (chan<- string, <-chan error) { return func() (chan<- string, <-chan error) {
httpConfig := httpserver.Config{}
httpConfig.Address = f.Address
httpConfig.TLS = f.TLS
httpConfig.CertFile = f.CertFile
httpConfig.KeyFile = f.KeyFile
httpConfig.Websocket = false
_, _, driver := memory.Start(f.maxMemory) _, _, driver := memory.Start(f.maxMemory)
ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), httpConfig) ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
return ctrl, status return ctrl, status
} }
} }
type webFactory struct { type webFactory struct {
server.Config httpserver.Config
} }
func (f webFactory) getStartServerFunc() startServerFunc { func (f webFactory) getStartServerFunc() startServerFunc {
return func() (chan<- string, <-chan error) { return func() (chan<- string, <-chan error) {
httpConfig := httpserver.Config{} ctrl, status, _ := httpserver.Start(web.HTTPHandler(), f.Config)
httpConfig.Address = f.Address
httpConfig.TLS = f.TLS
httpConfig.CertFile = f.CertFile
httpConfig.KeyFile = f.KeyFile
httpConfig.Websocket = false
ctrl, status, _ := httpserver.Start(web.HTTPHandler(), httpConfig)
return ctrl, status return ctrl, status
} }
} }
type donutFactory struct { type donutFactory struct {
server.Config httpserver.Config
paths []string paths []string
} }
func (f donutFactory) getStartServerFunc() startServerFunc { func (f donutFactory) getStartServerFunc() startServerFunc {
return func() (chan<- string, <-chan error) { return func() (chan<- string, <-chan error) {
httpConfig := httpserver.Config{}
httpConfig.Address = f.Address
httpConfig.TLS = f.TLS
httpConfig.CertFile = f.CertFile
httpConfig.KeyFile = f.KeyFile
httpConfig.Websocket = false
_, _, driver := donut.Start(f.paths) _, _, driver := donut.Start(f.paths)
ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), httpConfig) ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
return ctrl, status return ctrl, status
} }
} }
@ -248,14 +229,14 @@ func runDonut(c *cli.Context) {
startMinio(servers) startMinio(servers)
} }
func getAPIServerConfig(c *cli.Context) server.Config { func getAPIServerConfig(c *cli.Context) httpserver.Config {
certFile := c.String("cert") certFile := c.String("cert")
keyFile := c.String("key") keyFile := c.String("key")
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") { if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
log.Fatalln("Both certificate and key must be provided to enable https") log.Fatalln("Both certificate and key must be provided to enable https")
} }
tls := (certFile != "" && keyFile != "") tls := (certFile != "" && keyFile != "")
return server.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,
@ -265,7 +246,7 @@ func getAPIServerConfig(c *cli.Context) server.Config {
} }
func getWebServerConfigFunc(c *cli.Context) startServerFunc { func getWebServerConfigFunc(c *cli.Context) startServerFunc {
config := server.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,

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

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

8
pkg/server/server.go
View File

@ -17,11 +17,3 @@
package server package server
// Config - http server parameters // Config - http server parameters
type Config struct {
Domain string
Address string
TLS bool
CertFile string
KeyFile string
APIType interface{}
}