MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-06 20:33:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: --console-address when specified endpoints missing (#12534)

Browse Source 
Additionally upgrade console dependency for reading
environment variables properly.
This commit is contained in:
Harshavardhana
2021-06-20 23:04:47 -07:00
committed by GitHub
parent e1870c7b7c
commit 8f1fe3b761
13 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/server-main.go
View File

@@ -123,7 +123,7 @@ func serverHandleCmdArgs(ctx *cli.Context) {
// Handle common command args.
handleCommonCmdArgs(ctx)
logger.FatalIf(CheckLocalServerAddr(globalCLIContext.Addr), "Unable to validate passed arguments")
logger.FatalIf(CheckLocalServerAddr(globalMinioAddr), "Unable to validate passed arguments")
var err error
var setupType SetupType
@@ -144,7 +144,7 @@ func serverHandleCmdArgs(ctx *cli.Context) {
// Register root CAs for remote ENVs
env.RegisterGlobalCAs(globalRootCAs)
globalEndpoints, setupType, err = createServerEndpoints(globalCLIContext.Addr, serverCmdArgs(ctx)...)
globalEndpoints, setupType, err = createServerEndpoints(globalMinioAddr, serverCmdArgs(ctx)...)
logger.FatalIf(err, "Invalid command line arguments")
globalLocalNodeName = GetLocalPeer(globalEndpoints, globalMinioHost, globalMinioPort)
@@ -595,11 +595,11 @@ func serverMain(ctx *cli.Context) {
}
go func() {
<-globalOSSignalCh
consoleSrv.Shutdown()
logger.FatalIf(consoleSrv.Serve(), "Unable to initialize console server")
}()
consoleSrv.Serve()
<-globalOSSignalCh
consoleSrv.Shutdown()
} else {
<-globalOSSignalCh
}