diff --git a/weed/filer2/cassandra/cassandra_store.go b/weed/filer2/cassandra/cassandra_store.go index 1309cd1ee..e8f51dd04 100644 --- a/weed/filer2/cassandra/cassandra_store.go +++ b/weed/filer2/cassandra/cassandra_store.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/gocql/gocql" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/gocql/gocql" ) func init() { diff --git a/weed/filer2/configuration.go b/weed/filer2/configuration.go index 387672311..510e27ab1 100644 --- a/weed/filer2/configuration.go +++ b/weed/filer2/configuration.go @@ -4,7 +4,7 @@ import ( "os" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/spf13/viper" + "github.com/spf13/viper" ) const ( diff --git a/weed/filer2/memdb/memdb_store.go b/weed/filer2/memdb/memdb_store.go index db3a86bd2..062f1cd1c 100644 --- a/weed/filer2/memdb/memdb_store.go +++ b/weed/filer2/memdb/memdb_store.go @@ -3,9 +3,9 @@ package memdb import ( "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/google/btree" "strings" - "github.com/chrislusf/seaweedfs/weed/util" ) func init() { diff --git a/weed/filer2/mysql/mysql_store.go b/weed/filer2/mysql/mysql_store.go index 8adec161f..e18299bd2 100644 --- a/weed/filer2/mysql/mysql_store.go +++ b/weed/filer2/mysql/mysql_store.go @@ -6,8 +6,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" - _ "github.com/go-sql-driver/mysql" "github.com/chrislusf/seaweedfs/weed/util" + _ "github.com/go-sql-driver/mysql" ) const ( diff --git a/weed/filer2/postgres/postgres_store.go b/weed/filer2/postgres/postgres_store.go index 8836e2be7..ffd3d1e01 100644 --- a/weed/filer2/postgres/postgres_store.go +++ b/weed/filer2/postgres/postgres_store.go @@ -6,8 +6,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" - _ "github.com/lib/pq" "github.com/chrislusf/seaweedfs/weed/util" + _ "github.com/lib/pq" ) const ( diff --git a/weed/filer2/redis/redis_cluster_store.go b/weed/filer2/redis/redis_cluster_store.go index 8a3dce4b8..4f74a8a22 100644 --- a/weed/filer2/redis/redis_cluster_store.go +++ b/weed/filer2/redis/redis_cluster_store.go @@ -2,8 +2,8 @@ package redis import ( "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/go-redis/redis" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/go-redis/redis" ) func init() { diff --git a/weed/filer2/redis/redis_store.go b/weed/filer2/redis/redis_store.go index 77d157ab4..c56fa014c 100644 --- a/weed/filer2/redis/redis_store.go +++ b/weed/filer2/redis/redis_store.go @@ -2,8 +2,8 @@ package redis import ( "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/go-redis/redis" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/go-redis/redis" ) func init() { diff --git a/weed/msgqueue/kafka/kafka_queue.go b/weed/msgqueue/kafka/kafka_queue.go index 7f0273ad9..f373395f4 100644 --- a/weed/msgqueue/kafka/kafka_queue.go +++ b/weed/msgqueue/kafka/kafka_queue.go @@ -4,8 +4,8 @@ import ( "github.com/Shopify/sarama" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/msgqueue" - "github.com/golang/protobuf/proto" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/golang/protobuf/proto" ) func init() { diff --git a/weed/msgqueue/log/log_queue.go b/weed/msgqueue/log/log_queue.go index 612212ae0..d291d629c 100644 --- a/weed/msgqueue/log/log_queue.go +++ b/weed/msgqueue/log/log_queue.go @@ -3,8 +3,8 @@ package kafka import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/msgqueue" - "github.com/golang/protobuf/proto" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/golang/protobuf/proto" ) func init() { diff --git a/weed/msgqueue/message_queue.go b/weed/msgqueue/message_queue.go index a14d9b480..3e2688698 100644 --- a/weed/msgqueue/message_queue.go +++ b/weed/msgqueue/message_queue.go @@ -1,8 +1,8 @@ package msgqueue import ( - "github.com/golang/protobuf/proto" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/golang/protobuf/proto" ) type MessageQueue interface { diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 7a345abe9..4fd167593 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -11,11 +11,11 @@ import ( _ "github.com/chrislusf/seaweedfs/weed/filer2/postgres" _ "github.com/chrislusf/seaweedfs/weed/filer2/redis" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/msgqueue" _ "github.com/chrislusf/seaweedfs/weed/msgqueue/kafka" _ "github.com/chrislusf/seaweedfs/weed/msgqueue/log" "github.com/chrislusf/seaweedfs/weed/security" "github.com/spf13/viper" - "github.com/chrislusf/seaweedfs/weed/msgqueue" ) type FilerOption struct {