MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 22:55:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #379 from fkautz/pr_out_adding_iodine_to_pkg_server_server_go

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-03-25 17:04:41 -07:00
commit d81472f836
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/server/server.go
View File

@ -17,11 +17,12 @@
package server package server
import ( import (
"log"
"os/user" "os/user"
"path" "path"
"reflect" "reflect"
"errors"
"github.com/minio-io/iodine"
"github.com/minio-io/minio/pkg/api" "github.com/minio-io/minio/pkg/api"
"github.com/minio-io/minio/pkg/api/web" "github.com/minio-io/minio/pkg/api/web"
"github.com/minio-io/minio/pkg/drivers" "github.com/minio-io/minio/pkg/drivers"
@ -29,6 +30,7 @@ import (
"github.com/minio-io/minio/pkg/drivers/file" "github.com/minio-io/minio/pkg/drivers/file"
"github.com/minio-io/minio/pkg/drivers/memory" "github.com/minio-io/minio/pkg/drivers/memory"
"github.com/minio-io/minio/pkg/server/httpserver" "github.com/minio-io/minio/pkg/server/httpserver"
"github.com/minio-io/minio/pkg/utils/log"
) )
// Config - http server parameters // Config - http server parameters
@ -107,7 +109,10 @@ func getHTTPChannels(configs []Config) (ctrlChans []chan<- string, statusChans [
statusChans = append(statusChans, statusChan) statusChans = append(statusChans, statusChan)
} }
default: default:
log.Fatal("Invalid api type") {
err := iodine.New(errors.New("Invalid API type"), nil)
log.Fatal(err.EmitHumanReadable())
}
} }
} }
return return
@ -137,6 +142,7 @@ func getDriverChannels(driverType DriverType) (ctrlChans []chan<- string, status
{ {
u, err := user.Current() u, err := user.Current()
if err != nil { if err != nil {
log.Errorln(iodine.New(err, nil).EmitHumanReadable())
return nil, nil, nil return nil, nil, nil
} }
root := path.Join(u.HomeDir, "minio-storage", "file") root := path.Join(u.HomeDir, "minio-storage", "file")
@ -148,6 +154,7 @@ func getDriverChannels(driverType DriverType) (ctrlChans []chan<- string, status
{ {
u, err := user.Current() u, err := user.Current()
if err != nil { if err != nil {
log.Errorln(iodine.New(err, nil).EmitHumanReadable())
return nil, nil, nil return nil, nil, nil
} }
root := path.Join(u.HomeDir, "minio-driver", "donut") root := path.Join(u.HomeDir, "minio-driver", "donut")
@ -156,7 +163,10 @@ func getDriverChannels(driverType DriverType) (ctrlChans []chan<- string, status
statusChans = append(statusChans, statusChan) statusChans = append(statusChans, statusChan)
} }
default: // should never happen default: // should never happen
log.Fatal("No driver found") {
err := iodine.New(errors.New("No driver found"), nil)
log.Fatal(err.EmitHumanReadable())
}
} }
return return
} }