From 0655151b8c55ea3c34dd59277da1599279740164 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 22 Jul 2018 01:15:11 -0700 Subject: [PATCH] go fmt --- weed/command/mount.go | 2 +- weed/command/mount_std.go | 2 +- weed/filesys/wfs.go | 2 +- weed/s3api/s3api_errors.go | 2 +- weed/s3api/s3api_object_handlers.go | 2 +- weed/s3api/s3api_objects_list_handlers.go | 12 ++++++------ weed/s3api/s3api_server.go | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/weed/command/mount.go b/weed/command/mount.go index 0912a51ba..613066951 100644 --- a/weed/command/mount.go +++ b/weed/command/mount.go @@ -1,9 +1,9 @@ package command import ( - "strings" "fmt" "strconv" + "strings" ) type MountOptions struct { diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 8f4d8dc36..92dcc9008 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -60,7 +60,7 @@ func runMount(cmd *Command, args []string) bool { mountRoot := *mountOptions.filerMountRootPath if mountRoot != "/" && strings.HasSuffix(mountRoot, "/") { - mountRoot = mountRoot[0: len(mountRoot)-1] + mountRoot = mountRoot[0 : len(mountRoot)-1] } err = fs.Serve(c, filesys.NewSeaweedFileSystem(&filesys.Option{ diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 423ec54e4..9b1b98ebf 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -34,7 +34,7 @@ type WFS struct { func NewSeaweedFileSystem(option *Option) *WFS { return &WFS{ - option: option, + option: option, listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)), pathToHandleIndex: make(map[string]int), } diff --git a/weed/s3api/s3api_errors.go b/weed/s3api/s3api_errors.go index 2a86595fb..e5ce8df5a 100644 --- a/weed/s3api/s3api_errors.go +++ b/weed/s3api/s3api_errors.go @@ -26,7 +26,7 @@ type ErrorCode int // Error codes, see full list at http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html const ( - ErrNone ErrorCode = iota + ErrNone ErrorCode = iota ErrMethodNotAllowed ErrBucketNotEmpty ErrBucketAlreadyExists diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 6c1895cbc..a9be99d2f 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/gorilla/mux" + "io" "io/ioutil" "net/http" - "io" ) var ( diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index 6699ccd0c..46a623202 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -1,17 +1,17 @@ package s3api import ( + "context" + "fmt" + "github.com/chrislusf/seaweedfs/weed/filer2" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/gorilla/mux" "net/http" "net/url" - "strconv" - "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "context" - "fmt" "path/filepath" + "strconv" "time" - "github.com/chrislusf/seaweedfs/weed/filer2" ) const ( diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index 463f6e156..f5748da09 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -37,7 +37,7 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) { apiRouter := router.PathPrefix("/").Subrouter() var routers []*mux.Router if s3a.option.DomainName != "" { - routers = append(routers, apiRouter.Host("{bucket:.+}." + s3a.option.DomainName).Subrouter()) + routers = append(routers, apiRouter.Host("{bucket:.+}."+s3a.option.DomainName).Subrouter()) } routers = append(routers, apiRouter.PathPrefix("/{bucket}").Subrouter())