Skip to content

Commit

Permalink
Merge pull request minio#469 from harshavardhana/pr_out_file_driver_t…
Browse files Browse the repository at this point in the history
…o_take_the_high_road
  • Loading branch information
Harshavardhana committed Apr 16, 2015
2 parents 7d01300 + 3f33643 commit ed67a12
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 848 deletions.
2 changes: 0 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ func init() {

func getDriverType(input string) server.DriverType {
switch {
case input == "file":
return server.File
case input == "memory":
return server.Memory
case input == "donut":
Expand Down
9 changes: 0 additions & 9 deletions pkg/api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
"github.com/minio-io/minio/pkg/api"
"github.com/minio-io/minio/pkg/storage/drivers"
"github.com/minio-io/minio/pkg/storage/drivers/donut"
"github.com/minio-io/minio/pkg/storage/drivers/file"
"github.com/minio-io/minio/pkg/storage/drivers/memory"
"github.com/minio-io/minio/pkg/storage/drivers/mocks"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -65,14 +64,6 @@ var _ = Suite(&MySuite{
},
})

var _ = Suite(&MySuite{
initDriver: func() (drivers.Driver, string) {
root, _ := ioutil.TempDir(os.TempDir(), "minio-api")
_, _, driver := file.Start(root)
return driver, root
},
})

var _ = Suite(&MySuite{
initDriver: func() (drivers.Driver, string) {
root, _ := ioutil.TempDir(os.TempDir(), "minio-api")
Expand Down
14 changes: 0 additions & 14 deletions pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"github.com/minio-io/minio/pkg/server/httpserver"
"github.com/minio-io/minio/pkg/storage/drivers"
"github.com/minio-io/minio/pkg/storage/drivers/donut"
"github.com/minio-io/minio/pkg/storage/drivers/file"
"github.com/minio-io/minio/pkg/storage/drivers/memory"
"github.com/minio-io/minio/pkg/utils/log"
)
Expand Down Expand Up @@ -61,7 +60,6 @@ type DriverType int
// Driver types
const (
Memory DriverType = iota
File
Donut
)

Expand Down Expand Up @@ -140,18 +138,6 @@ func getDriverChannels(driverType DriverType) (ctrlChans []chan<- string, status
ctrlChans = append(ctrlChans, ctrlChan)
statusChans = append(statusChans, statusChan)
}
case driverType == File:
{
u, err := user.Current()
if err != nil {
log.Error.Println(iodine.New(err, nil))
return nil, nil, nil
}
root := path.Join(u.HomeDir, "minio-storage", "file")
ctrlChan, statusChan, driver = file.Start(root)
ctrlChans = append(ctrlChans, ctrlChan)
statusChans = append(statusChans, statusChan)
}
case driverType == Donut:
{
u, err := user.Current()
Expand Down
41 changes: 0 additions & 41 deletions pkg/storage/drivers/file/file.go

This file was deleted.

146 changes: 0 additions & 146 deletions pkg/storage/drivers/file/file_bucket.go

This file was deleted.

89 changes: 0 additions & 89 deletions pkg/storage/drivers/file/file_common.go

This file was deleted.

Loading

0 comments on commit ed67a12

Please sign in to comment.