go fmt

weed/command/benchmark.go

@@ -35,7 +35,7 @@ type BenchmarkOptions struct {
 	sequentialRead   *bool
 	collection       *string
 	replication      *string
-	diskType       *string
+	diskType         *string
 	cpuprofile       *string
 	maxCpu           *int
 	grpcDialOption   grpc.DialOption
@@ -236,7 +236,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stat) {
 			Count:       1,
 			Collection:  *b.collection,
 			Replication: *b.replication,
-			DiskType: *b.diskType,
+			DiskType:    *b.diskType,
 		}
 		if assignResult, err := operation.Assign(b.masterClient.GetMaster(), b.grpcDialOption, ar); err == nil {
 			fp.Server, fp.Fid, fp.Collection = assignResult.Url, assignResult.Fid, *b.collection

weed/command/filer_copy.go

@@ -37,7 +37,7 @@ type CopyOptions struct {
 	replication       *string
 	collection        *string
 	ttl               *string
-	diskType        *string
+	diskType          *string
 	maxMB             *int
 	masterClient      *wdclient.MasterClient
 	concurrenctFiles  *int
@@ -313,7 +313,7 @@ func (worker *FileCopyWorker) uploadFileAsOne(task FileCopyTask, f *os.File) err
 				Replication: *worker.options.replication,
 				Collection:  *worker.options.collection,
 				TtlSec:      worker.options.ttlSec,
-				DiskType:  *worker.options.diskType,
+				DiskType:    *worker.options.diskType,
 				Path:        task.destinationUrlPath,
 			}
 
@@ -408,7 +408,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File,
 					Replication: *worker.options.replication,
 					Collection:  *worker.options.collection,
 					TtlSec:      worker.options.ttlSec,
-					DiskType:  *worker.options.diskType,
+					DiskType:    *worker.options.diskType,
 					Path:        task.destinationUrlPath + fileName,
 				}
 

weed/command/filer_sync.go

@@ -31,8 +31,8 @@ type SyncOptions struct {
 	bCollection     *string
 	aTtlSec         *int
 	bTtlSec         *int
-	aDiskType     *string
-	bDiskType     *string
+	aDiskType       *string
+	bDiskType       *string
 	aDebug          *bool
 	bDebug          *bool
 }

weed/command/mount.go

@@ -12,7 +12,7 @@ type MountOptions struct {
 	dirAutoCreate               *bool
 	collection                  *string
 	replication                 *string
-	diskType                  *string
+	diskType                    *string
 	ttlSec                      *int
 	chunkSizeLimitMB            *int
 	concurrentWriters           *int

weed/command/mount_std.go

@@ -181,7 +181,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
 		Collection:                  *option.collection,
 		Replication:                 *option.replication,
 		TtlSec:                      int32(*option.ttlSec),
-		DiskType:                  diskType,
+		DiskType:                    diskType,
 		ChunkSizeLimit:              int64(chunkSizeLimitMB) * 1024 * 1024,
 		ConcurrentWriters:           *option.concurrentWriters,
 		CacheDir:                    *option.cacheDir,

weed/command/upload.go

@@ -23,7 +23,7 @@ type UploadOptions struct {
 	collection   *string
 	dataCenter   *string
 	ttl          *string
-	diskType   *string
+	diskType     *string
 	maxMB        *int
 	usePublicUrl *bool
 }

weed/command/volume.go

@@ -49,7 +49,7 @@ type VolumeServerOptions struct {
 	rack                  *string
 	whiteList             []string
 	indexType             *string
-	diskType            *string
+	diskType              *string
 	fixJpgOrientation     *bool
 	readRedirect          *bool
 	cpuProfile            *string

weed/filer/abstract_sql/abstract_sql_store_kv.go

@@ -34,7 +34,7 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by
 	}
 
 	_, err = res.RowsAffected()
-	if err != nil  {
+	if err != nil {
 		return fmt.Errorf("kv upsert no rows affected: %s", err)
 	}
 	return nil

weed/filer/entry.go

@@ -18,7 +18,7 @@ type Attr struct {
 	Replication   string      // replication
 	Collection    string      // collection name
 	TtlSec        int32       // ttl in seconds
-	DiskType    string
+	DiskType      string
 	UserName      string
 	GroupNames    []string
 	SymlinkTarget string

weed/filer/entry_codec.go

@@ -56,7 +56,7 @@ func EntryAttributeToPb(entry *Entry) *filer_pb.FuseAttributes {
 		Collection:    entry.Attr.Collection,
 		Replication:   entry.Attr.Replication,
 		TtlSec:        entry.Attr.TtlSec,
-		DiskType:    entry.Attr.DiskType,
+		DiskType:      entry.Attr.DiskType,
 		UserName:      entry.Attr.UserName,
 		GroupName:     entry.Attr.GroupNames,
 		SymlinkTarget: entry.Attr.SymlinkTarget,

weed/filer/filer_deletion.go

@@ -151,4 +151,3 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) {
 	}
 	f.DeleteChunks(toDelete)
 }
-

weed/filer/read_write.go

@@ -82,8 +82,8 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 
 	if err == filer_pb.ErrNotFound {
 		err = filer_pb.CreateEntry(client, &filer_pb.CreateEntryRequest{
-			Directory:          dir,
-			Entry:              &filer_pb.Entry{
+			Directory: dir,
+			Entry: &filer_pb.Entry{
 				Name:        name,
 				IsDirectory: false,
 				Attributes: &filer_pb.FuseAttributes{
@@ -92,7 +92,7 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 					FileMode:    uint32(0644),
 					Collection:  "",
 					Replication: "",
-					FileSize: uint64(len(content)),
+					FileSize:    uint64(len(content)),
 				},
 				Content: content,
 			},
@@ -103,8 +103,8 @@ func SaveInsideFiler(client filer_pb.SeaweedFilerClient, dir, name string, conte
 		entry.Attributes.Mtime = time.Now().Unix()
 		entry.Attributes.FileSize = uint64(len(content))
 		err = filer_pb.UpdateEntry(client, &filer_pb.UpdateEntryRequest{
-			Directory:          dir,
-			Entry:              entry,
+			Directory: dir,
+			Entry:     entry,
 		})
 	}
 

weed/filesys/wfs.go

@@ -31,7 +31,7 @@ type Option struct {
 	Collection         string
 	Replication        string
 	TtlSec             int32
-	DiskType         storage.DiskType
+	DiskType           storage.DiskType
 	ChunkSizeLimit     int64
 	ConcurrentWriters  int
 	CacheDir           string
@@ -178,7 +178,7 @@ func (wfs *WFS) Statfs(ctx context.Context, req *fuse.StatfsRequest, resp *fuse.
 				Collection:  wfs.option.Collection,
 				Replication: wfs.option.Replication,
 				Ttl:         fmt.Sprintf("%ds", wfs.option.TtlSec),
-				DiskType:  string(wfs.option.DiskType),
+				DiskType:    string(wfs.option.DiskType),
 			}
 
 			glog.V(4).Infof("reading filer stats: %+v", request)

weed/filesys/wfs_write.go

@@ -26,7 +26,7 @@ func (wfs *WFS) saveDataAsChunk(fullPath util.FullPath) filer.SaveDataAsChunkFun
 				Replication: wfs.option.Replication,
 				Collection:  wfs.option.Collection,
 				TtlSec:      wfs.option.TtlSec,
-				DiskType:  string(wfs.option.DiskType),
+				DiskType:    string(wfs.option.DiskType),
 				DataCenter:  wfs.option.DataCenter,
 				Path:        string(fullPath),
 			}

weed/operation/assign_file_id.go

@@ -18,7 +18,7 @@ type VolumeAssignRequest struct {
 	Replication         string
 	Collection          string
 	Ttl                 string
-	DiskType          string
+	DiskType            string
 	DataCenter          string
 	Rack                string
 	DataNode            string
@@ -55,7 +55,7 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum
 				Replication:         request.Replication,
 				Collection:          request.Collection,
 				Ttl:                 request.Ttl,
-				DiskType:          request.DiskType,
+				DiskType:            request.DiskType,
 				DataCenter:          request.DataCenter,
 				Rack:                request.Rack,
 				DataNode:            request.DataNode,
@@ -107,7 +107,7 @@ func LookupJwt(master string, fileId string) security.EncodedJwt {
 
 type StorageOption struct {
 	Replication       string
-	DiskType        string
+	DiskType          string
 	Collection        string
 	DataCenter        string
 	Rack              string
@@ -126,7 +126,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a
 		Replication:         so.Replication,
 		Collection:          so.Collection,
 		Ttl:                 so.TtlString(),
-		DiskType:          so.DiskType,
+		DiskType:            so.DiskType,
 		DataCenter:          so.DataCenter,
 		Rack:                so.Rack,
 		WritableVolumeCount: so.VolumeGrowthCount,
@@ -137,7 +137,7 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a
 			Replication:         so.Replication,
 			Collection:          so.Collection,
 			Ttl:                 so.TtlString(),
-			DiskType:          so.DiskType,
+			DiskType:            so.DiskType,
 			DataCenter:          "",
 			Rack:                "",
 			WritableVolumeCount: so.VolumeGrowthCount,

weed/operation/submit.go

@@ -25,7 +25,7 @@ type FilePart struct {
 	Collection  string
 	DataCenter  string
 	Ttl         string
-	DiskType  string
+	DiskType    string
 	Server      string //this comes from assign result
 	Fid         string //this comes from assign result, but customizable
 	Fsync       bool
@@ -50,7 +50,7 @@ func SubmitFiles(master string, grpcDialOption grpc.DialOption, files []FilePart
 		Collection:  collection,
 		DataCenter:  dataCenter,
 		Ttl:         ttl,
-		DiskType:  diskType,
+		DiskType:    diskType,
 	}
 	ret, err := Assign(master, grpcDialOption, ar)
 	if err != nil {
@@ -146,7 +146,7 @@ func (fi FilePart) Upload(maxMB int, master string, usePublicUrl bool, jwt secur
 				Replication: fi.Replication,
 				Collection:  fi.Collection,
 				Ttl:         fi.Ttl,
-				DiskType:  fi.DiskType,
+				DiskType:    fi.DiskType,
 			}
 			ret, err = Assign(master, grpcDialOption, ar)
 			if err != nil {
@@ -160,7 +160,7 @@ func (fi FilePart) Upload(maxMB int, master string, usePublicUrl bool, jwt secur
 					Replication: fi.Replication,
 					Collection:  fi.Collection,
 					Ttl:         fi.Ttl,
-					DiskType:  fi.DiskType,
+					DiskType:    fi.DiskType,
 				}
 				ret, err = Assign(master, grpcDialOption, ar)
 				if err != nil {

weed/replication/sink/filersink/fetch_write.go

@@ -77,7 +77,7 @@ func (fs *FilerSink) fetchAndWrite(sourceChunk *filer_pb.FileChunk, path string)
 			Collection:  fs.collection,
 			TtlSec:      fs.ttlSec,
 			DataCenter:  fs.dataCenter,
-			DiskType:  fs.diskType,
+			DiskType:    fs.diskType,
 			Path:        path,
 		}
 

weed/replication/sink/filersink/filer_sink.go

@@ -23,7 +23,7 @@ type FilerSink struct {
 	replication    string
 	collection     string
 	ttlSec         int32
-	diskType     string
+	diskType       string
 	dataCenter     string
 	grpcDialOption grpc.DialOption
 }

weed/s3api/auth_credentials.go

@@ -79,7 +79,6 @@ func (iam *IdentityAccessManagement) loadS3ApiConfigurationFromBytes(content []b
 	return nil
 }
 
-
 func (iam *IdentityAccessManagement) loadS3ApiConfiguration(config *iam_pb.S3ApiConfiguration) error {
 	var identities []*Identity
 	for _, ident := range config.Identities {

weed/s3api/s3_constants/s3_actions.go

@@ -7,4 +7,3 @@ const (
 	ACTION_TAGGING = "Tagging"
 	ACTION_LIST    = "List"
 )
-

weed/server/common.go

@@ -131,7 +131,7 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st
 		Replication: r.FormValue("replication"),
 		Collection:  r.FormValue("collection"),
 		Ttl:         r.FormValue("ttl"),
-		DiskType:  r.FormValue("disk"),
+		DiskType:    r.FormValue("disk"),
 	}
 	assignResult, ae := operation.Assign(masterUrl, grpcDialOption, ar)
 	if ae != nil {

weed/server/filer_grpc_server.go

@@ -405,7 +405,7 @@ func (fs *FilerServer) Statistics(ctx context.Context, req *filer_pb.StatisticsR
 			Replication: req.Replication,
 			Collection:  req.Collection,
 			Ttl:         req.Ttl,
-			DiskType:  req.DiskType,
+			DiskType:    req.DiskType,
 		})
 		if grpcErr != nil {
 			return grpcErr

weed/server/filer_server_handlers_write_autochunk.go

@@ -163,7 +163,7 @@ func (fs *FilerServer) saveMetaData(ctx context.Context, r *http.Request, fileNa
 			Replication: so.Replication,
 			Collection:  so.Collection,
 			TtlSec:      so.TtlSeconds,
-			DiskType:  so.DiskType,
+			DiskType:    so.DiskType,
 			Mime:        contentType,
 			Md5:         md5bytes,
 			FileSize:    uint64(chunkOffset),

weed/server/filer_server_handlers_write_cipher.go

@@ -68,7 +68,7 @@ func (fs *FilerServer) encrypt(ctx context.Context, w http.ResponseWriter, r *ht
 			Replication: so.Replication,
 			Collection:  so.Collection,
 			TtlSec:      so.TtlSeconds,
-			DiskType:  so.DiskType,
+			DiskType:    so.DiskType,
 			Mime:        pu.MimeType,
 			Md5:         util.Base64Md5ToBytes(pu.ContentMd5),
 		},

weed/server/master_grpc_server_volume.go

@@ -70,7 +70,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest
 		Collection:         req.Collection,
 		ReplicaPlacement:   replicaPlacement,
 		Ttl:                ttl,
-		DiskType:         diskType,
+		DiskType:           diskType,
 		Prealloacte:        ms.preallocateSize,
 		DataCenter:         req.DataCenter,
 		Rack:               req.Rack,

weed/server/master_server_handlers_admin.go

@@ -174,7 +174,7 @@ func (ms *MasterServer) getVolumeGrowOption(r *http.Request) (*topology.VolumeGr
 		Collection:         r.FormValue("collection"),
 		ReplicaPlacement:   replicaPlacement,
 		Ttl:                ttl,
-		DiskType:         diskType,
+		DiskType:           diskType,
 		Prealloacte:        preallocate,
 		DataCenter:         r.FormValue("dataCenter"),
 		Rack:               r.FormValue("rack"),

weed/server/webdav_server.go

@@ -33,7 +33,7 @@ type WebDavOption struct {
 	BucketsPath      string
 	GrpcDialOption   grpc.DialOption
 	Collection       string
-	DiskType       string
+	DiskType         string
 	Uid              uint32
 	Gid              uint32
 	Cipher           bool
@@ -379,7 +379,7 @@ func (f *WebDavFile) saveDataAsChunk(reader io.Reader, name string, offset int64
 			Count:       1,
 			Replication: "",
 			Collection:  f.fs.option.Collection,
-			DiskType:  f.fs.option.DiskType,
+			DiskType:    f.fs.option.DiskType,
 			Path:        name,
 		}
 

weed/shell/command_volume_server_evacuate.go

@@ -175,7 +175,7 @@ func moveAwayOneEcVolume(commandEnv *CommandEnv, ecShardInfo *master_pb.VolumeEc
 
 func moveAwayOneNormalVolume(commandEnv *CommandEnv, volumeReplicas map[uint32][]*VolumeReplica, vol *master_pb.VolumeInformationMessage, thisNode *Node, otherNodes []*Node, applyChange bool) (hasMoved bool, err error) {
 	sort.Slice(otherNodes, func(i, j int) bool {
-		return otherNodes[i].localVolumeRatio(capacityByMaxVolumeCount) + otherNodes[i].localVolumeRatio(capacityByMaxSsdVolumeCount) < otherNodes[j].localVolumeRatio(capacityByMaxVolumeCount) + otherNodes[j].localVolumeRatio(capacityByMaxSsdVolumeCount)
+		return otherNodes[i].localVolumeRatio(capacityByMaxVolumeCount)+otherNodes[i].localVolumeRatio(capacityByMaxSsdVolumeCount) < otherNodes[j].localVolumeRatio(capacityByMaxVolumeCount)+otherNodes[j].localVolumeRatio(capacityByMaxSsdVolumeCount)
 	})
 
 	for i := 0; i < len(otherNodes); i++ {

weed/storage/disk_location.go

@@ -19,7 +19,7 @@ import (
 type DiskLocation struct {
 	Directory              string
 	IdxDirectory           string
-	DiskType             DiskType
+	DiskType               DiskType
 	MaxVolumeCount         int
 	OriginalMaxVolumeCount int
 	MinFreeSpacePercent    float32
@@ -43,7 +43,7 @@ func NewDiskLocation(dir string, maxVolumeCount int, minFreeSpacePercent float32
 	location := &DiskLocation{
 		Directory:              dir,
 		IdxDirectory:           idxDir,
-		DiskType:             diskType,
+		DiskType:               diskType,
 		MaxVolumeCount:         maxVolumeCount,
 		OriginalMaxVolumeCount: maxVolumeCount,
 		MinFreeSpacePercent:    minFreeSpacePercent,

weed/storage/volume_info.go

@@ -14,7 +14,7 @@ type VolumeInfo struct {
 	Size              uint64
 	ReplicaPlacement  *super_block.ReplicaPlacement
 	Ttl               *needle.TTL
-	DiskType        string
+	DiskType          string
 	Collection        string
 	Version           needle.Version
 	FileCount         int
@@ -41,7 +41,7 @@ func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err er
 		ModifiedAtSecond:  m.ModifiedAtSecond,
 		RemoteStorageName: m.RemoteStorageName,
 		RemoteStorageKey:  m.RemoteStorageKey,
-		DiskType:        m.DiskType,
+		DiskType:          m.DiskType,
 	}
 	rp, e := super_block.NewReplicaPlacementFromByte(byte(m.ReplicaPlacement))
 	if e != nil {
@@ -93,7 +93,7 @@ func (vi VolumeInfo) ToVolumeInformationMessage() *master_pb.VolumeInformationMe
 		ModifiedAtSecond:  vi.ModifiedAtSecond,
 		RemoteStorageName: vi.RemoteStorageName,
 		RemoteStorageKey:  vi.RemoteStorageKey,
-		DiskType:        vi.DiskType,
+		DiskType:          vi.DiskType,
 	}
 }
 

weed/storage/volume_loading.go

@@ -92,7 +92,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
 	if err == nil && alsoLoadIndex {
 		// adjust for existing volumes with .idx together with .dat files
 		if v.dirIdx != v.dir {
-			if util.FileExists(v.DataFileName()+".idx") {
+			if util.FileExists(v.DataFileName() + ".idx") {
 				v.dirIdx = v.dir
 			}
 		}
@@ -100,12 +100,12 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
 		if v.noWriteOrDelete {
 			glog.V(0).Infoln("open to read file", v.FileName(".idx"))
 			if indexFile, err = os.OpenFile(v.FileName(".idx"), os.O_RDONLY, 0644); err != nil {
-				return fmt.Errorf("cannot read Volume Index %s: %v",  v.FileName(".idx"), err)
+				return fmt.Errorf("cannot read Volume Index %s: %v", v.FileName(".idx"), err)
 			}
 		} else {
 			glog.V(1).Infoln("open to write file", v.FileName(".idx"))
 			if indexFile, err = os.OpenFile(v.FileName(".idx"), os.O_RDWR|os.O_CREATE, 0644); err != nil {
-				return fmt.Errorf("cannot write Volume Index %s: %v",  v.FileName(".idx"), err)
+				return fmt.Errorf("cannot write Volume Index %s: %v", v.FileName(".idx"), err)
 			}
 		}
 		if v.lastAppendAtNs, err = CheckAndFixVolumeDataIntegrity(v, indexFile); err != nil {
@@ -115,7 +115,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind
 
 		if v.noWriteOrDelete || v.noWriteCanDelete {
 			if v.nm, err = NewSortedFileNeedleMap(v.IndexFileName(), indexFile); err != nil {
-				glog.V(0).Infof("loading sorted db %s error: %v",  v.FileName(".sdx"), err)
+				glog.V(0).Infof("loading sorted db %s error: %v", v.FileName(".sdx"), err)
 			}
 		} else {
 			switch needleMapKind {

weed/storage/volume_type.go

@@ -6,7 +6,7 @@ type DiskType string
 
 const (
 	HardDriveType DiskType = ""
-	SsdType                  = "ssd"
+	SsdType                = "ssd"
 )
 
 func ToDiskType(vt string) (diskType DiskType, err error) {

weed/topology/topology_test.go

@@ -60,7 +60,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) {
 				ReplicaPlacement: uint32(0),
 				Version:          uint32(needle.CurrentVersion),
 				Ttl:              0,
-				DiskType:       "ssd",
+				DiskType:         "ssd",
 			}
 			volumeMessages = append(volumeMessages, volumeMessage)
 		}
@@ -168,7 +168,7 @@ func TestAddRemoveVolume(t *testing.T) {
 		Id:               needle.VolumeId(1),
 		Size:             100,
 		Collection:       "xcollection",
-		DiskType:       "ssd",
+		DiskType:         "ssd",
 		FileCount:        123,
 		DeleteCount:      23,
 		DeletedByteCount: 45,

weed/topology/volume_growth.go

@@ -27,7 +27,7 @@ type VolumeGrowOption struct {
 	Collection         string
 	ReplicaPlacement   *super_block.ReplicaPlacement
 	Ttl                *needle.TTL
-	DiskType         storage.DiskType
+	DiskType           storage.DiskType
 	Prealloacte        int64
 	DataCenter         string
 	Rack               string

weed/topology/volume_layout.go

@@ -103,7 +103,7 @@ func (v *volumesBinaryState) copyState(list *VolumeLocationList) copyState {
 type VolumeLayout struct {
 	rp               *super_block.ReplicaPlacement
 	ttl              *needle.TTL
-	diskType       storage.DiskType
+	diskType         storage.DiskType
 	vid2location     map[needle.VolumeId]*VolumeLocationList
 	writables        []needle.VolumeId   // transient array of writable volume id
 	readonlyVolumes  *volumesBinaryState // readonly volumes
@@ -123,7 +123,7 @@ func NewVolumeLayout(rp *super_block.ReplicaPlacement, ttl *needle.TTL, diskType
 	return &VolumeLayout{
 		rp:               rp,
 		ttl:              ttl,
-		diskType:       diskType,
+		diskType:         diskType,
 		vid2location:     make(map[needle.VolumeId]*VolumeLocationList),
 		writables:        *new([]needle.VolumeId),
 		readonlyVolumes:  NewVolumesBinaryState(readOnlyState, rp, ExistCopies()),

weed/util/config.go

@@ -19,11 +19,11 @@ type Configuration interface {
 func LoadConfiguration(configFileName string, required bool) (loaded bool) {
 
 	// find a filer store
-	viper.SetConfigName(configFileName)     // name of config file (without extension)
-	viper.AddConfigPath(".")                // optionally look for config in the working directory
-	viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths
-	viper.AddConfigPath("/usr/local/etc/seaweedfs/")  // search path for bsd-style config directory in
-	viper.AddConfigPath("/etc/seaweedfs/")  // path to look for the config file in
+	viper.SetConfigName(configFileName)              // name of config file (without extension)
+	viper.AddConfigPath(".")                         // optionally look for config in the working directory
+	viper.AddConfigPath("$HOME/.seaweedfs")          // call multiple times to add many search paths
+	viper.AddConfigPath("/usr/local/etc/seaweedfs/") // search path for bsd-style config directory in
+	viper.AddConfigPath("/etc/seaweedfs/")           // path to look for the config file in
 
 	glog.V(1).Infof("Reading %s.toml from %s", configFileName, viper.ConfigFileUsed())