aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2018-07-28 21:02:56 -0700
committerChris Lu <chris.lu@gmail.com>2018-07-28 21:02:56 -0700
commitd3205a007071f26587affb416f71b5c63854b863 (patch)
treeee53ef0aa023e6f815470624a86ecc38c05fee4a
parent7214a8e265544c1e507351789409f75abe485acc (diff)
downloadseaweedfs-d3205a007071f26587affb416f71b5c63854b863.tar.xz
seaweedfs-d3205a007071f26587affb416f71b5c63854b863.zip
go fmt
-rw-r--r--weed/filer2/filer.go12
-rw-r--r--weed/server/master_grpc_server.go4
-rw-r--r--weed/server/master_server.go2
-rw-r--r--weed/wdclient/masterclient.go4
-rw-r--r--weed/wdclient/vid_map.go9
5 files changed, 16 insertions, 15 deletions
diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go
index 100117e6a..1f2697cda 100644
--- a/weed/filer2/filer.go
+++ b/weed/filer2/filer.go
@@ -1,18 +1,18 @@
package filer2
import (
+ "context"
"fmt"
-
- "github.com/chrislusf/seaweedfs/weed/glog"
- "github.com/chrislusf/seaweedfs/weed/operation"
- "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
- "github.com/karlseguin/ccache"
"os"
"path/filepath"
"strings"
"time"
+
+ "github.com/chrislusf/seaweedfs/weed/glog"
+ "github.com/chrislusf/seaweedfs/weed/operation"
+ "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/wdclient"
- "context"
+ "github.com/karlseguin/ccache"
)
type Filer struct {
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go
index 53e4b59e1..2952a8071 100644
--- a/weed/server/master_grpc_server.go
+++ b/weed/server/master_grpc_server.go
@@ -1,15 +1,15 @@
package weed_server
import (
+ "fmt"
"net"
"strings"
+ "github.com/chrislusf/raft"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/topology"
"google.golang.org/grpc/peer"
- "fmt"
- "github.com/chrislusf/raft"
)
func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServer) error {
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index 5b6bc8509..07a398ead 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -9,12 +9,12 @@ import (
"github.com/chrislusf/raft"
"github.com/chrislusf/seaweedfs/weed/glog"
+ "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/sequence"
"github.com/chrislusf/seaweedfs/weed/topology"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/gorilla/mux"
- "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
)
type MasterServer struct {
diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go
index e3ffd4834..347901f1a 100644
--- a/weed/wdclient/masterclient.go
+++ b/weed/wdclient/masterclient.go
@@ -2,12 +2,12 @@ package wdclient
import (
"context"
- "time"
"fmt"
+ "time"
+ "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/util"
- "github.com/chrislusf/seaweedfs/weed/glog"
)
type MasterClient struct {
diff --git a/weed/wdclient/vid_map.go b/weed/wdclient/vid_map.go
index 0b0cba178..2f56b8fce 100644
--- a/weed/wdclient/vid_map.go
+++ b/weed/wdclient/vid_map.go
@@ -1,13 +1,14 @@
package wdclient
import (
- "sync"
- "strings"
- "math/rand"
"errors"
+ "fmt"
+ "math/rand"
"strconv"
+ "strings"
+ "sync"
+
"github.com/chrislusf/seaweedfs/weed/glog"
- "fmt"
)
type Location struct {