diff options
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 630ba72a7..437b0ad83 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -2,9 +2,6 @@ package command import ( "fmt" - "github.com/chrislusf/raft/protobuf" - "github.com/chrislusf/seaweedfs/weed/security" - "github.com/spf13/viper" "net/http" "os" "runtime" @@ -14,6 +11,10 @@ import ( "sync" "time" + "github.com/chrislusf/raft/protobuf" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/spf13/viper" + "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/server" @@ -107,7 +108,8 @@ func init() { func runServer(cmd *Command, args []string) bool { - weed_server.LoadConfiguration("security", false) + util.LoadConfiguration("security", false) + util.LoadConfiguration("master", false) if *serverOptions.cpuprofile != "" { f, err := os.Create(*serverOptions.cpuprofile) |