diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-08-13 01:22:32 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-08-13 01:22:32 -0700 |
| commit | 5c467083e51ae7c2491b933da95e71aeb3fe773e (patch) | |
| tree | bcf0d524bd4dc34ea538bbdcbbff68218c41f6d2 | |
| parent | f036ef8a3c50af3c933dcd96026ca70dc5fd0da3 (diff) | |
| download | seaweedfs-5c467083e51ae7c2491b933da95e71aeb3fe773e.tar.xz seaweedfs-5c467083e51ae7c2491b933da95e71aeb3fe773e.zip | |
go fmt
| -rw-r--r-- | weed/msgqueue/configuration.go | 8 | ||||
| -rw-r--r-- | weed/msgqueue/kafka/kafka_queue.go | 5 | ||||
| -rw-r--r-- | weed/msgqueue/log/log_queue.go | 3 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 7 |
4 files changed, 11 insertions, 12 deletions
diff --git a/weed/msgqueue/configuration.go b/weed/msgqueue/configuration.go index 63f103c1e..dec954c09 100644 --- a/weed/msgqueue/configuration.go +++ b/weed/msgqueue/configuration.go @@ -33,10 +33,10 @@ var ( func LoadConfiguration() { // find a filer store - viper.SetConfigName("message_queue") // name of config file (without extension) - viper.AddConfigPath(".") // optionally look for config in the working directory - viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths - viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in + viper.SetConfigName("message_queue") // name of config file (without extension) + viper.AddConfigPath(".") // optionally look for config in the working directory + viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths + viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in if err := viper.ReadInConfig(); err != nil { // Handle errors reading the config file glog.Fatalf("Failed to load message_queue.toml file from current directory, or $HOME/.seaweedfs/, "+ "or /etc/seaweedfs/"+ diff --git a/weed/msgqueue/kafka/kafka_queue.go b/weed/msgqueue/kafka/kafka_queue.go index c013baf5f..72bfd657a 100644 --- a/weed/msgqueue/kafka/kafka_queue.go +++ b/weed/msgqueue/kafka/kafka_queue.go @@ -1,11 +1,10 @@ package kafka import ( - _ "github.com/go-sql-driver/mysql" - "github.com/chrislusf/seaweedfs/weed/msgqueue" - "github.com/golang/protobuf/proto" "github.com/Shopify/sarama" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/msgqueue" + "github.com/golang/protobuf/proto" ) func init() { diff --git a/weed/msgqueue/log/log_queue.go b/weed/msgqueue/log/log_queue.go index ef7967e6c..9ce9ff8be 100644 --- a/weed/msgqueue/log/log_queue.go +++ b/weed/msgqueue/log/log_queue.go @@ -1,10 +1,9 @@ package kafka import ( - _ "github.com/go-sql-driver/mysql" + "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/msgqueue" "github.com/golang/protobuf/proto" - "github.com/chrislusf/seaweedfs/weed/glog" ) func init() { diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index c9dabe5cb..61bb6e0ea 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -1,6 +1,8 @@ package weed_server import ( + "net/http" + "github.com/chrislusf/seaweedfs/weed/filer2" _ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra" _ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb" @@ -8,12 +10,11 @@ import ( _ "github.com/chrislusf/seaweedfs/weed/filer2/mysql" _ "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/glog" "github.com/chrislusf/seaweedfs/weed/security" - "net/http" - "github.com/chrislusf/seaweedfs/weed/msgqueue" ) type FilerOption struct { |