diff options
| -rw-r--r-- | weed/filer2/filechunks.go | 4 | ||||
| -rw-r--r-- | weed/filesys/dirty_page.go | 1 | ||||
| -rw-r--r-- | weed/s3api/filer_multipart.go | 12 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_multipart_handlers.go | 12 | ||||
| -rw-r--r-- | weed/s3api/s3api_objects_list_handlers.go | 2 | ||||
| -rw-r--r-- | weed/s3api/s3api_server.go | 2 |
6 files changed, 16 insertions, 17 deletions
diff --git a/weed/filer2/filechunks.go b/weed/filer2/filechunks.go index e47cb762f..b248a8c59 100644 --- a/weed/filer2/filechunks.go +++ b/weed/filer2/filechunks.go @@ -1,10 +1,10 @@ package filer2 import ( + "fmt" + "hash/fnv" "math" "sort" - "hash/fnv" - "fmt" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go index dd080f721..3b55d5c0b 100644 --- a/weed/filesys/dirty_page.go +++ b/weed/filesys/dirty_page.go @@ -130,7 +130,6 @@ func (pages *ContinuousDirtyPages) saveExistingPagesToStorage(ctx context.Contex func (pages *ContinuousDirtyPages) saveToStorage(ctx context.Context, buf []byte, offset int64) (*filer_pb.FileChunk, error) { - var fileId, host string if err := pages.f.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go index d9cafae26..cfd46c9f8 100644 --- a/weed/s3api/filer_multipart.go +++ b/weed/s3api/filer_multipart.go @@ -2,17 +2,17 @@ package s3api import ( "fmt" - "time" - "strings" - "strconv" "path/filepath" + "strconv" + "strings" + "time" - "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/aws" - "github.com/satori/go.uuid" + "github.com/aws/aws-sdk-go/service/s3" + "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/chrislusf/seaweedfs/weed/filer2" + "github.com/satori/go.uuid" ) func (s3a *S3ApiServer) createMultipartUpload(input *s3.CreateMultipartUploadInput) (output *s3.CreateMultipartUploadOutput, code ErrorCode) { diff --git a/weed/s3api/s3api_object_multipart_handlers.go b/weed/s3api/s3api_object_multipart_handlers.go index 042736856..d9baa9aae 100644 --- a/weed/s3api/s3api_object_multipart_handlers.go +++ b/weed/s3api/s3api_object_multipart_handlers.go @@ -1,16 +1,16 @@ package s3api import ( - "net/http" - "github.com/gorilla/mux" + "encoding/xml" "fmt" - "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/aws" - "net/url" - "strconv" + "github.com/aws/aws-sdk-go/service/s3" + "github.com/gorilla/mux" "io/ioutil" - "encoding/xml" + "net/http" + "net/url" "sort" + "strconv" "strings" ) diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index e104b4c9e..d751a3b1d 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -11,10 +11,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" + "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/gorilla/mux" - "github.com/chrislusf/seaweedfs/weed/filer2" ) const ( diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index efeeb34ce..a62b521de 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()) |