Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

go fmt

pull/753/head
Chris Lu 6 years ago
parent
1d7e01b754
commit
08266b7256
11 changed files with 42 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      weed/command/filer_replication.go
  2. 11
      weed/command/volume.go
  3. 2
      weed/filesys/dir.go
  4. 2
      weed/operation/delete_content.go
  5. 8
      weed/replication/notification_kafka.go
  6. 2
      weed/replication/replicator.go
  7. 10
      weed/replication/sink/azuresink/azure_sink.go
  8. 4
      weed/replication/sink/filersink/filer_sink.go
  9. 6
      weed/replication/sink/gcssink/gcs_sink.go
  10. 16
      weed/replication/sink/s3sink/s3_sink.go
  11. 13
      weed/replication/sink/s3sink/s3_write.go

6
weed/command/filer_replication.go
View File

@ -5,12 +5,12 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/replication"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/s3sink"
_ "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/server"
"github.com/spf13/viper"
)
func init() {

11
weed/command/volume.go
View File

@ -1,17 +1,18 @@
package command
import (
"net/http"
"os"
"runtime"
"runtime/pprof"
"strconv"
"strings"
"time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"net/http"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/server"
"time"
"runtime/pprof"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util"
)
var (

2
weed/filesys/dir.go
View File

@ -66,7 +66,7 @@ func (dir *Dir) Attr(context context.Context, attr *fuse.Attr) error {
return err
}
if resp.Entry!=nil {
if resp.Entry != nil {
dir.attributes = resp.Entry.Attributes
}

2
weed/operation/delete_content.go
View File

@ -10,9 +10,9 @@ import (
"net/http"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
)
type DeleteResult struct {

8
weed/replication/notification_kafka.go
View File

@ -1,17 +1,17 @@
package replication
import (
"encoding/json"
"fmt"
"io/ioutil"
"sync"
"time"
"github.com/Shopify/sarama"
"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"
"io/ioutil"
"encoding/json"
"sync"
"time"
)
func init() {

2
weed/replication/replicator.go
View File

@ -4,11 +4,11 @@ import (
"path/filepath"
"strings"
"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 Replicator struct {

10
weed/replication/sink/azuresink/azure_sink.go
View File

@ -1,17 +1,17 @@
package azuresink
import (
"bytes"
"context"
"fmt"
"net/url"
"bytes"
"github.com/Azure/azure-storage-blob-go/2016-05-31/azblob"
"github.com/chrislusf/seaweedfs/weed/filer2"
"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/filer2"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/Azure/azure-storage-blob-go/2016-05-31/azblob"
)
type AzureSink struct {
@ -46,7 +46,7 @@ func (g *AzureSink) SetSourceFiler(s *source.FilerSource) {
g.filerSource = s
}
func (g *AzureSink) initialize(accountName, accountKey, container, dir string) (error) {
func (g *AzureSink) initialize(accountName, accountKey, container, dir string) error {
g.container = container
g.dir = dir

4
weed/replication/sink/filersink/filer_sink.go
View File

@ -7,9 +7,9 @@ import (
"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/replication/sink"
)
type FilerSink struct {
@ -22,7 +22,7 @@ type FilerSink struct {
dataCenter string
}
func init(){
func init() {
sink.Sinks = append(sink.Sinks, &FilerSink{})
}

6
weed/replication/sink/gcssink/gcs_sink.go
View File

@ -7,11 +7,11 @@ import (
"os"
"cloud.google.com/go/storage"
"github.com/chrislusf/seaweedfs/weed/filer2"
"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/filer2"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"google.golang.org/api/option"
)
@ -46,7 +46,7 @@ func (g *GcsSink) SetSourceFiler(s *source.FilerSource) {
g.filerSource = s
}
func (g *GcsSink) initialize(google_application_credentials, bucketName, dir string) (error) {
func (g *GcsSink) initialize(google_application_credentials, bucketName, dir string) error {
g.bucket = bucketName
g.dir = dir

16
weed/replication/sink/s3sink/s3_sink.go
View File

@ -4,16 +4,16 @@ import (
"fmt"
"sync"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/aws/aws-sdk-go/service/s3"
"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/s3"
"github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
)
type S3Sink struct {
@ -50,7 +50,7 @@ func (s3sink *S3Sink) SetSourceFiler(s *source.FilerSource) {
s3sink.filerSource = s
}
func (s3sink *S3Sink) initialize(awsAccessKeyId, aswSecretAccessKey, region, bucket, dir string) (error) {
func (s3sink *S3Sink) initialize(awsAccessKeyId, aswSecretAccessKey, region, bucket, dir string) error {
s3sink.region = region
s3sink.bucket = bucket
s3sink.dir = dir

13
weed/replication/sink/s3sink/s3_write.go
View File

@ -1,16 +1,17 @@
package S3Sink
import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/aws"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/aws/aws-sdk-go/aws/awserr"
"bytes"
"fmt"
"io"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"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/util"
"bytes"
)
func (s3sink *S3Sink) deleteObject(key string) error {

Write Preview
Loading…
Cancel
Save