MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-28 13:09:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

handlers: Fix the naming of all handlers.

Browse Source
This commit is contained in:
Harshavardhana
2016-02-04 14:57:20 -08:00
parent 4d97c042da
commit 012fbe756b
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
routers.go
View File

@@ -54,14 +54,14 @@ type WebAPI struct {
}
func getWebAPIHandler(web *WebAPI) http.Handler {
var mwHandlers = []MiddlewareHandler{
var handlerFns = []HandlerFunc{
setCacheControlHandler, // Adds Cache-Control header
TimeValidityHandler, // Validate time.
AuthHandler, // Authentication handler for verifying tokens.
CorsHandler, // CORS added only for testing purposes.
setTimeValidityHandler, // Validate time.
setJWTAuthHandler, // Authentication handler for verifying JWT's.
setCorsHandler, // CORS added only for testing purposes.
}
if web.AccessLog {
mwHandlers = append(mwHandlers, AccessLogHandler)
handlerFns = append(handlerFns, setAccessLogHandler)
}
s := jsonrpc.NewServer()
@@ -77,7 +77,7 @@ func getWebAPIHandler(web *WebAPI) http.Handler {
// Enable this when we add assets.
// root.PathPrefix("/login").Handler(http.StripPrefix("/login", http.FileServer(assetFS())))
// root.Handle("/{file:.*}", http.FileServer(assetFS()))
return registerCustomMiddleware(mux, mwHandlers...)
return registerHandlers(mux, handlerFns...)
}
// registerCloudStorageAPI - register all the handlers to their respective paths
@@ -154,17 +154,17 @@ func getNewCloudStorageAPI(conf cloudServerConfig) CloudStorageAPI {
}
func getCloudStorageAPIHandler(api CloudStorageAPI) http.Handler {
var mwHandlers = []MiddlewareHandler{
TimeValidityHandler,
IgnoreResourcesHandler,
IgnoreSignatureV2RequestHandler,
SignatureHandler,
var handlerFns = []HandlerFunc{
setTimeValidityHandler,
setIgnoreResourcesHandler,
setIgnoreSignatureV2RequestHandler,
setSignatureHandler,
}
if api.AccessLog {
mwHandlers = append(mwHandlers, AccessLogHandler)
handlerFns = append(handlerFns, setAccessLogHandler)
}
mwHandlers = append(mwHandlers, CorsHandler)
handlerFns = append(handlerFns, setCorsHandler)
mux := router.NewRouter()
registerCloudStorageAPI(mux, api)
return registerCustomMiddleware(mux, mwHandlers...)
return registerHandlers(mux, handlerFns...)
}