astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-19 04:00:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moving bucket request channel to private config option

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2014-11-07 19:07:16 -08:00
parent 00b5a5d380
commit 4e6214514f
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gateway.go
+12 -11
View File
@@ -10,7 +10,8 @@ import (
// Stores system configuration, populated from CLI or test runner
type GatewayConfig struct {
StorageDriver StorageDriver
StorageDriver StorageDriver
requestBucketChan chan BucketRequest
}
// Message for requesting a bucket
@@ -37,7 +38,7 @@ type StorageDriver func(bucket string, input chan ObjectRequest)
type fakeContext struct{}
type GatewayGetHandler struct {
requestBucketChan chan BucketRequest
config GatewayConfig
}
// GET requests server
@@ -47,7 +48,7 @@ func (handler GatewayGetHandler) ServeHTTP(w http.ResponseWriter, req *http.Requ
path := vars["path"]
context := fakeContext{}
callback := make(chan Bucket)
handler.requestBucketChan <- BucketRequest{
handler.config.requestBucketChan <- BucketRequest{
name: bucketName,
context: context,
callback: callback,
@@ -64,7 +65,7 @@ func (handler GatewayGetHandler) ServeHTTP(w http.ResponseWriter, req *http.Requ
}
type GatewayPutHandler struct {
requestBucketChan chan BucketRequest
config GatewayConfig
}
func (handler GatewayPutHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
@@ -74,7 +75,7 @@ func (handler GatewayPutHandler) ServeHTTP(w http.ResponseWriter, req *http.Requ
object, _ := ioutil.ReadAll(req.Body)
context := fakeContext{}
callback := make(chan Bucket)
handler.requestBucketChan <- BucketRequest{
handler.config.requestBucketChan <- BucketRequest{
name: bucketName,
context: context,
callback: callback,
@@ -84,17 +85,17 @@ func (handler GatewayPutHandler) ServeHTTP(w http.ResponseWriter, req *http.Requ
}
func RegisterGatewayHandlers(router *mux.Router, config GatewayConfig) {
requestBucketChan := make(chan BucketRequest)
go SynchronizedBucketService(requestBucketChan, config)
getHandler := GatewayGetHandler{requestBucketChan: requestBucketChan}
putHandler := GatewayPutHandler{requestBucketChan: requestBucketChan}
config.requestBucketChan = make(chan BucketRequest)
go SynchronizedBucketService(config)
getHandler := GatewayGetHandler{config}
putHandler := GatewayPutHandler{config}
router.Handle("/{bucket}/{path:.*}", getHandler).Methods("GET")
router.Handle("/{bucket}/{path:.*}", putHandler).Methods("PUT")
}
func SynchronizedBucketService(input chan BucketRequest, config GatewayConfig) {
func SynchronizedBucketService(config GatewayConfig) {
buckets := make(map[string]*SynchronizedBucket)
for request := range input {
for request := range config.requestBucketChan {
if buckets[request.name] == nil {
bucketChannel := make(chan ObjectRequest)
go config.StorageDriver(request.name, bucketChannel)