mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Creating subdirectories in fs now works

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2015-01-27 17:47:11 -08:00
parent 25ad24997e
commit 5daa408e2c
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/server/server.go
View File

@@ -18,15 +18,19 @@ package server
import (
"log"
"os"
"os/user"
"path"
"reflect"
"github.com/minio-io/minio/pkg/httpserver"
mstorage "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/storage/fs"
"github.com/minio-io/minio/pkg/storage/inmemory"
"github.com/minio-io/minio/pkg/webapi/minioapi"
)
func Start(hostname string, tls bool, certFile, keyFile string) {
func Start(hostname string, tls bool, certFile, keyFile string, inMemoryStorage bool) {
var ctrlChans []chan<- string
var statusChans []<-chan error
@@ -44,9 +48,26 @@ func Start(hostname string, tls bool, certFile, keyFile string) {
srv.KeyFile = keyFile
}
ctrlChan, statusChan, storage = inmemory.Start()
ctrlChans = append(ctrlChans, ctrlChan)
statusChans = append(statusChans, statusChan)
if inMemoryStorage {
ctrlChan, statusChan, storage = inmemory.Start()
ctrlChans = append(ctrlChans, ctrlChan)
statusChans = append(statusChans, statusChan)
} else {
currentUser, err := user.Current()
if err != nil {
log.Fatal(err)
}
rootPath := path.Join(currentUser.HomeDir, "minio-storage")
_, err = os.Stat(rootPath)
if os.IsNotExist(err) {
err = os.Mkdir(rootPath, 0700)
} else if err != nil {
log.Fatal("Could not create $HOME/minio-storage", err)
}
ctrlChan, statusChan, storage = fs.Start(rootPath)
ctrlChans = append(ctrlChans, ctrlChan)
statusChans = append(statusChans, statusChan)
}
ctrlChan, statusChan = httpserver.Start(minioapi.HttpHandler(storage), srv)
ctrlChans = append(ctrlChans, ctrlChan)