mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename MCS to Console in codebase (#205)

Browse Source
This commit is contained in:
Daniel Valdivia
2020-07-26 00:34:17 -07:00
committed by GitHub
parent bc8429bd6b
commit 769c8caa71
229 changed files with 891 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
restapi/server.go
View File

@@ -42,7 +42,7 @@ import (
flags "github.com/jessevdk/go-flags"
"golang.org/x/net/netutil"
"github.com/minio/mcs/restapi/operations"
"github.com/minio/console/restapi/operations"
)
const (
@@ -59,8 +59,8 @@ func init() {
}
}
// NewServer creates a new api mcs server but does not configure it
func NewServer(api *operations.McsAPI) *Server {
// NewServer creates a new api console server but does not configure it
func NewServer(api *operations.ConsoleAPI) *Server {
s := new(Server)
s.shutdown = make(chan struct{})
@@ -83,14 +83,14 @@ func (s *Server) ConfigureFlags() {
}
}
// Server for the mcs API
// Server for the console API
type Server struct {
EnabledListeners []string `long:"scheme" description:"the listeners to enable, this can be repeated and defaults to the schemes in the swagger spec"`
CleanupTimeout time.Duration `long:"cleanup-timeout" description:"grace period for which to wait before killing idle connections" default:"10s"`
GracefulTimeout time.Duration `long:"graceful-timeout" description:"grace period for which to wait before shutting down the server" default:"15s"`
MaxHeaderSize flagext.ByteSize `long:"max-header-size" description:"controls the maximum number of bytes the server will read parsing the request header's keys and values, including the request line. It does not limit the size of the request body." default:"1MiB"`
SocketPath flags.Filename `long:"socket-path" description:"the unix socket to listen on" default:"/var/run/mcs.sock"`
SocketPath flags.Filename `long:"socket-path" description:"the unix socket to listen on" default:"/var/run/console.sock"`
domainSocketL net.Listener
Host string `long:"host" description:"the IP to listen on" default:"localhost" env:"HOST"`
@@ -112,7 +112,7 @@ type Server struct {
TLSWriteTimeout time.Duration `long:"tls-write-timeout" description:"maximum duration before timing out write of the response"`
httpsServerL net.Listener
api *operations.McsAPI
api *operations.ConsoleAPI
handler http.Handler
hasListeners bool
shutdown chan struct{}
@@ -142,7 +142,7 @@ func (s *Server) Fatalf(f string, args ...interface{}) {
}
// SetAPI configures the server with the specified API. Needs to be called before Serve
func (s *Server) SetAPI(api *operations.McsAPI) {
func (s *Server) SetAPI(api *operations.ConsoleAPI) {
if api == nil {
s.api = nil
s.handler = nil
@@ -203,13 +203,13 @@ func (s *Server) Serve() (err error) {
servers = append(servers, domainSocket)
wg.Add(1)
s.Logf("Serving mcs at unix://%s", s.SocketPath)
s.Logf("Serving console at unix://%s", s.SocketPath)
go func(l net.Listener) {
defer wg.Done()
if err := domainSocket.Serve(l); err != nil && err != http.ErrServerClosed {
s.Fatalf("%v", err)
}
s.Logf("Stopped serving mcs at unix://%s", s.SocketPath)
s.Logf("Stopped serving console at unix://%s", s.SocketPath)
}(s.domainSocketL)
}
@@ -233,13 +233,13 @@ func (s *Server) Serve() (err error) {
servers = append(servers, httpServer)
wg.Add(1)
s.Logf("Serving mcs at http://%s", s.httpServerL.Addr())
s.Logf("Serving console at http://%s", s.httpServerL.Addr())
go func(l net.Listener) {
defer wg.Done()
if err := httpServer.Serve(l); err != nil && err != http.ErrServerClosed {
s.Fatalf("%v", err)
}
s.Logf("Stopped serving mcs at http://%s", l.Addr())
s.Logf("Stopped serving console at http://%s", l.Addr())
}(s.httpServerL)
}
@@ -329,13 +329,13 @@ func (s *Server) Serve() (err error) {
servers = append(servers, httpsServer)
wg.Add(1)
s.Logf("Serving mcs at https://%s", s.httpsServerL.Addr())
s.Logf("Serving console at https://%s", s.httpsServerL.Addr())
go func(l net.Listener) {
defer wg.Done()
if err := httpsServer.Serve(l); err != nil && err != http.ErrServerClosed {
s.Fatalf("%v", err)
}
s.Logf("Stopped serving mcs at https://%s", l.Addr())
s.Logf("Stopped serving console at https://%s", l.Addr())
}(tls.NewListener(s.httpsServerL, httpsServer.TLSConfig))
}