Merge pull request #817 from harshavardhana/probe

Add probe to main
This commit is contained in:
Harshavardhana 2015-09-05 21:23:43 -07:00
commit 95cb056fd5
2 changed files with 7 additions and 7 deletions

View File

@ -22,6 +22,7 @@ import (
"github.com/minio/cli" "github.com/minio/cli"
"github.com/minio/minio/pkg/donut" "github.com/minio/minio/pkg/donut"
"github.com/minio/minio/pkg/probe"
) )
var ( var (
@ -68,19 +69,19 @@ func makeDonutMain(c *cli.Context) {
var disks []string var disks []string
for _, disk := range c.Args().Tail() { for _, disk := range c.Args().Tail() {
if _, err := isUsable(disk); err != nil { if _, err := isUsable(disk); err != nil {
Fatalln(err) Fatalln(err.Trace())
} }
disks = append(disks, disk) disks = append(disks, disk)
} }
for _, disk := range disks { for _, disk := range disks {
if err := os.MkdirAll(filepath.Join(disk, donutName), 0700); err != nil { if err := os.MkdirAll(filepath.Join(disk, donutName), 0700); err != nil {
Fatalln(err) Fatalln(probe.NewError(err))
} }
} }
hostname, err := os.Hostname() hostname, err := os.Hostname()
if err != nil { if err != nil {
Fatalln(err) Fatalln(probe.NewError(err))
} }
donutConfig := &donut.Config{} donutConfig := &donut.Config{}
donutConfig.Version = "0.0.1" donutConfig.Version = "0.0.1"
@ -92,7 +93,7 @@ func makeDonutMain(c *cli.Context) {
donutConfig.MaxSize = 512000000 donutConfig.MaxSize = 512000000
if err := donut.SaveConfig(donutConfig); err != nil { if err := donut.SaveConfig(donutConfig); err != nil {
Fatalln(err) Fatalln(err.Trace())
} }
Infoln("Success!") Infoln("Success!")

View File

@ -60,8 +60,7 @@ func serverMain(c *cli.Context) {
cli.ShowCommandHelpAndExit(c, "server", 1) cli.ShowCommandHelpAndExit(c, "server", 1)
} }
apiServerConfig := getServerConfig(c) apiServerConfig := getServerConfig(c)
err := server.StartServices(apiServerConfig) if err := server.StartServices(apiServerConfig); err != nil {
if err != nil { Fatalln(err.Trace())
Fatalln(err)
} }
} }