From 3674ad9f8ea86cb4903eaf6f1e3c2598d7f602eb Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 1 Nov 2018 01:12:21 -0700 Subject: [PATCH] go fmt --- weed/command/filer_replication.go | 2 +- weed/notification/aws_sqs/aws_sqs_pub.go | 13 +++++++------ weed/notification/google_pub_sub/google_pub_sub.go | 4 ++-- weed/replication/sink/s3sink/s3_sink.go | 2 +- weed/replication/sub/notification_aws_sqs.go | 10 +++++----- weed/replication/sub/notification_google_pub_sub.go | 2 +- weed/server/filer_server.go | 2 +- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/weed/command/filer_replication.go b/weed/command/filer_replication.go index 4780e9a3b..419ae3174 100644 --- a/weed/command/filer_replication.go +++ b/weed/command/filer_replication.go @@ -11,9 +11,9 @@ import ( _ "github.com/chrislusf/seaweedfs/weed/replication/sink/filersink" _ "github.com/chrislusf/seaweedfs/weed/replication/sink/gcssink" _ "github.com/chrislusf/seaweedfs/weed/replication/sink/s3sink" + "github.com/chrislusf/seaweedfs/weed/replication/sub" "github.com/chrislusf/seaweedfs/weed/server" "github.com/spf13/viper" - "github.com/chrislusf/seaweedfs/weed/replication/sub" ) func init() { diff --git a/weed/notification/aws_sqs/aws_sqs_pub.go b/weed/notification/aws_sqs/aws_sqs_pub.go index ab8d28006..c1af7f27a 100644 --- a/weed/notification/aws_sqs/aws_sqs_pub.go +++ b/weed/notification/aws_sqs/aws_sqs_pub.go @@ -1,16 +1,17 @@ package aws_sqs import ( + "fmt" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/sqs" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/notification" "github.com/chrislusf/seaweedfs/weed/util" "github.com/golang/protobuf/proto" - "github.com/aws/aws-sdk-go/service/sqs" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/session" - "fmt" - "github.com/aws/aws-sdk-go/aws/awserr" ) func init() { diff --git a/weed/notification/google_pub_sub/google_pub_sub.go b/weed/notification/google_pub_sub/google_pub_sub.go index 419fb26a4..7b26bfe38 100644 --- a/weed/notification/google_pub_sub/google_pub_sub.go +++ b/weed/notification/google_pub_sub/google_pub_sub.go @@ -1,16 +1,16 @@ package google_pub_sub import ( + "context" "fmt" "os" + "cloud.google.com/go/pubsub" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/notification" "github.com/chrislusf/seaweedfs/weed/util" "github.com/golang/protobuf/proto" "google.golang.org/api/option" - "context" - "cloud.google.com/go/pubsub" ) func init() { diff --git a/weed/replication/sink/s3sink/s3_sink.go b/weed/replication/sink/s3sink/s3_sink.go index 50146a57d..3d497d795 100644 --- a/weed/replication/sink/s3sink/s3_sink.go +++ b/weed/replication/sink/s3sink/s3_sink.go @@ -10,11 +10,11 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" "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/replication/sink" "github.com/chrislusf/seaweedfs/weed/replication/source" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/glog" ) type S3Sink struct { diff --git a/weed/replication/sub/notification_aws_sqs.go b/weed/replication/sub/notification_aws_sqs.go index fe1732e88..f0100f4de 100644 --- a/weed/replication/sub/notification_aws_sqs.go +++ b/weed/replication/sub/notification_aws_sqs.go @@ -3,15 +3,15 @@ package sub import ( "fmt" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/sqs" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" "github.com/golang/protobuf/proto" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/sqs" - "github.com/aws/aws-sdk-go/aws/awserr" ) func init() { diff --git a/weed/replication/sub/notification_google_pub_sub.go b/weed/replication/sub/notification_google_pub_sub.go index 49b0c56de..ad6b42a2e 100644 --- a/weed/replication/sub/notification_google_pub_sub.go +++ b/weed/replication/sub/notification_google_pub_sub.go @@ -5,11 +5,11 @@ import ( "fmt" "os" + "cloud.google.com/go/pubsub" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" "github.com/golang/protobuf/proto" - "cloud.google.com/go/pubsub" "google.golang.org/api/option" ) diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index f4100e5b2..120d07414 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -12,9 +12,9 @@ import ( _ "github.com/chrislusf/seaweedfs/weed/filer2/redis" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/notification" - _ "github.com/chrislusf/seaweedfs/weed/notification/kafka" _ "github.com/chrislusf/seaweedfs/weed/notification/aws_sqs" _ "github.com/chrislusf/seaweedfs/weed/notification/google_pub_sub" + _ "github.com/chrislusf/seaweedfs/weed/notification/kafka" _ "github.com/chrislusf/seaweedfs/weed/notification/log" "github.com/chrislusf/seaweedfs/weed/security" "github.com/spf13/viper"