mirror of
https://github.com/minio/minio.git
synced 2025-11-07 21:02:58 -05:00
use package name correctly (#5827)
This commit is contained in:
@@ -19,7 +19,7 @@ package cmd
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
router "github.com/gorilla/mux"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
func newObjectLayerFn() (layer ObjectLayer) {
|
||||
@@ -34,27 +34,27 @@ func newCacheObjectsFn() CacheObjectLayer {
|
||||
}
|
||||
|
||||
// Composed function registering routers for only distributed XL setup.
|
||||
func registerDistXLRouters(mux *router.Router, endpoints EndpointList) error {
|
||||
func registerDistXLRouters(router *mux.Router, endpoints EndpointList) error {
|
||||
// Register storage rpc router only if its a distributed setup.
|
||||
err := registerStorageRPCRouters(mux, endpoints)
|
||||
err := registerStorageRPCRouters(router, endpoints)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Register distributed namespace lock.
|
||||
err = registerDistNSLockRouter(mux, endpoints)
|
||||
err = registerDistNSLockRouter(router, endpoints)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Register S3 peer communication router.
|
||||
err = registerS3PeerRPCRouter(mux)
|
||||
err = registerS3PeerRPCRouter(router)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Register RPC router for web related calls.
|
||||
return registerBrowserPeerRPCRouter(mux)
|
||||
return registerBrowserPeerRPCRouter(router)
|
||||
}
|
||||
|
||||
// List of some generic handlers which are applied for all incoming requests.
|
||||
@@ -100,38 +100,38 @@ var globalHandlers = []HandlerFunc{
|
||||
func configureServerHandler(endpoints EndpointList) (http.Handler, error) {
|
||||
// Initialize router. `SkipClean(true)` stops gorilla/mux from
|
||||
// normalizing URL path minio/minio#3256
|
||||
mux := router.NewRouter().SkipClean(true)
|
||||
router := mux.NewRouter().SkipClean(true)
|
||||
|
||||
// Initialize distributed NS lock.
|
||||
if globalIsDistXL {
|
||||
registerDistXLRouters(mux, endpoints)
|
||||
registerDistXLRouters(router, endpoints)
|
||||
}
|
||||
|
||||
// Add Admin RPC router
|
||||
err := registerAdminRPCRouter(mux)
|
||||
err := registerAdminRPCRouter(router)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Add Admin router.
|
||||
registerAdminRouter(mux)
|
||||
registerAdminRouter(router)
|
||||
|
||||
// Add healthcheck router
|
||||
registerHealthCheckRouter(mux)
|
||||
registerHealthCheckRouter(router)
|
||||
|
||||
// Add server metrics router
|
||||
registerMetricsRouter(mux)
|
||||
registerMetricsRouter(router)
|
||||
|
||||
// Register web router when its enabled.
|
||||
if globalIsBrowserEnabled {
|
||||
if err := registerWebRouter(mux); err != nil {
|
||||
if err := registerWebRouter(router); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
// Add API router.
|
||||
registerAPIRouter(mux)
|
||||
registerAPIRouter(router)
|
||||
|
||||
// Register rest of the handlers.
|
||||
return registerHandlers(mux, globalHandlers...), nil
|
||||
return registerHandlers(router, globalHandlers...), nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user