Merge pull request #898 from harshavardhana/merge-few-files
Restructure top level files a bit, merge code into common file
This commit is contained in:
commit
05de60a598
5 changed files with 23 additions and 66 deletions
|
@ -1,48 +0,0 @@
|
|||
/*
|
||||
* Minio Cloud Storage, (C) 2015 Minio, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
router "github.com/gorilla/mux"
|
||||
jsonrpc "github.com/gorilla/rpc/v2"
|
||||
"github.com/gorilla/rpc/v2/json"
|
||||
)
|
||||
|
||||
// getControllerRPCHandler rpc handler for controller
|
||||
func getControllerRPCHandler(anonymous bool) http.Handler {
|
||||
var mwHandlers = []MiddlewareHandler{
|
||||
TimeValidityHandler,
|
||||
}
|
||||
if !anonymous {
|
||||
mwHandlers = append(mwHandlers, RPCSignatureHandler)
|
||||
}
|
||||
|
||||
s := jsonrpc.NewServer()
|
||||
codec := json.NewCodec()
|
||||
s.RegisterCodec(codec, "application/json")
|
||||
s.RegisterCodec(codec, "application/json; charset=UTF-8")
|
||||
s.RegisterService(new(controllerRPCService), "Controller")
|
||||
mux := router.NewRouter()
|
||||
// Add new RPC services here
|
||||
mux.Handle("/rpc", s)
|
||||
mux.Handle("/{file:.*}", http.FileServer(assetFS()))
|
||||
|
||||
rpcHandler := registerCustomMiddleware(mux, mwHandlers...)
|
||||
return rpcHandler
|
||||
}
|
18
doc.go
18
doc.go
|
@ -1,18 +0,0 @@
|
|||
/*
|
||||
* Minio Cloud Storage, (C) 2014 Minio, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
// Minio Cloud Storage
|
||||
package main
|
|
@ -108,3 +108,26 @@ func getServerRPCHandler(anonymous bool) http.Handler {
|
|||
rpcHandler := registerCustomMiddleware(mux, mwHandlers...)
|
||||
return rpcHandler
|
||||
}
|
||||
|
||||
// getControllerRPCHandler rpc handler for controller
|
||||
func getControllerRPCHandler(anonymous bool) http.Handler {
|
||||
var mwHandlers = []MiddlewareHandler{
|
||||
TimeValidityHandler,
|
||||
}
|
||||
if !anonymous {
|
||||
mwHandlers = append(mwHandlers, RPCSignatureHandler)
|
||||
}
|
||||
|
||||
s := jsonrpc.NewServer()
|
||||
codec := json.NewCodec()
|
||||
s.RegisterCodec(codec, "application/json")
|
||||
s.RegisterCodec(codec, "application/json; charset=UTF-8")
|
||||
s.RegisterService(new(controllerRPCService), "Controller")
|
||||
mux := router.NewRouter()
|
||||
// Add new RPC services here
|
||||
mux.Handle("/rpc", s)
|
||||
mux.Handle("/{file:.*}", http.FileServer(assetFS()))
|
||||
|
||||
rpcHandler := registerCustomMiddleware(mux, mwHandlers...)
|
||||
return rpcHandler
|
||||
}
|
Loading…
Reference in a new issue