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

server: Print proper endpoint, along with https if configured. (#1514)

Browse Source 
Fixes #1492
This commit is contained in:
Harshavardhana 2016-05-06 21:18:29 -07:00 committed by Anand Babu (AB) Periasamy
parent 0625c050e6
commit a20ccb1e83
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server-main.go
View File

@ -99,12 +99,11 @@ func configureServer(srvCmdConfig serverCmdConfig) *http.Server {
return apiServer return apiServer
} }
// Print listen ips. // getListenIPs - gets all the ips to listen on.
func printListenIPs(httpServerConf *http.Server) { func getListenIPs(httpServerConf *http.Server) (hosts []string, port string) {
host, port, err := net.SplitHostPort(httpServerConf.Addr) host, port, err := net.SplitHostPort(httpServerConf.Addr)
fatalIf(err, "Unable to split host port.", nil) fatalIf(err, "Unable to split host port.", nil)
var hosts []string
switch { switch {
case host != "": case host != "":
hosts = append(hosts, host) hosts = append(hosts, host)
@ -120,8 +119,13 @@ func printListenIPs(httpServerConf *http.Server) {
} }
} }
} }
return hosts, port
}
// Print listen ips.
func printListenIPs(tls bool, hosts []string, port string) {
for _, host := range hosts { for _, host := range hosts {
if httpServerConf.TLSConfig != nil { if tls {
console.Printf(" https://%s:%s\n", host, port) console.Printf(" https://%s:%s\n", host, port)
} else { } else {
console.Printf(" http://%s:%s\n", host, port) console.Printf(" http://%s:%s\n", host, port)
@ -285,23 +289,33 @@ func serverMain(c *cli.Context) {
// Print credentials and region. // Print credentials and region.
console.Println("\n" + cred.String() + " " + colorMagenta("Region: ") + colorWhite(region)) console.Println("\n" + cred.String() + " " + colorMagenta("Region: ") + colorWhite(region))
hosts, port := getListenIPs(apiServer) // get listen ips and port.
tls := apiServer.TLSConfig != nil // 'true' if TLS is enabled.
console.Println("\nMinio Object Storage:") console.Println("\nMinio Object Storage:")
// Print api listen ips. // Print api listen ips.
printListenIPs(apiServer) printListenIPs(tls, hosts, port)
console.Println("\nMinio Browser:") console.Println("\nMinio Browser:")
// Print browser listen ips. // Print browser listen ips.
printListenIPs(apiServer) printListenIPs(tls, hosts, port)
console.Println("\nTo configure Minio Client:") console.Println("\nTo configure Minio Client:")
// Download 'mc' links.
// Figure out right endpoint for 'mc'.
endpoint := fmt.Sprintf("http://%s:%s", hosts[0], port)
if tls {
endpoint = fmt.Sprintf("https://%s:%s", hosts[0], port)
}
// Download 'mc' info.
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
console.Println(" Download 'mc' from https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc.exe") console.Printf(" Download 'mc' from https://dl.minio.io/client/mc/release/%s-%s/mc.exe\n", runtime.GOOS, runtime.GOARCH)
console.Println(" $ mc.exe config host add myminio http://localhost:9000 " + cred.AccessKeyID + " " + cred.SecretAccessKey) console.Printf(" $ mc.exe config host add myminio %s %s %s\n", endpoint, cred.AccessKeyID, cred.SecretAccessKey)
} else { } else {
console.Println(" $ wget https://dl.minio.io/client/mc/release/" + runtime.GOOS + "-" + runtime.GOARCH + "/mc") console.Printf(" $ wget https://dl.minio.io/client/mc/release/%s-%s/mc\n", runtime.GOOS, runtime.GOARCH)
console.Println(" $ chmod 755 mc") console.Printf(" $ chmod 755 mc\n")
console.Println(" $ ./mc config host add myminio http://localhost:9000 " + cred.AccessKeyID + " " + cred.SecretAccessKey) console.Printf(" $ ./mc config host add myminio %s %s %s\n", endpoint, cred.AccessKeyID, cred.SecretAccessKey)
} }
// Start server. // Start server.