mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-28 13:31:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1092 from binbinshi/master

Browse Source 
fix: weed shell filer config is constant
This commit is contained in:
Chris Lu 2019-10-25 07:08:59 -07:00 committed by GitHub
commit 05fe7a2366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
weed/command/shell.go
View File

@ -14,6 +14,12 @@ var (
func init() {
cmdShell.Run = runShell // break init cycle
shellOptions.Masters = cmdShell.Flag.String("master", "localhost:9333", "comma-separated master servers")
filerHost := cmdShell.Flag.String("filer.host", "localhost", "comma-separated filer server host")
flierPort := cmdShell.Flag.Int64("filer.port", 8888, "comma-separated filer server port")
directory := cmdShell.Flag.String("filer.dir", "/", "comma-separated filer server directory")
shellOptions.FilerHost = *filerHost
shellOptions.FilerPort = *flierPort
shellOptions.Directory = *directory
}
var cmdShell = &Command{
@ -24,19 +30,14 @@ var cmdShell = &Command{
`,
}
var ()
func runShell(command *Command, args []string) bool {
util.LoadConfiguration("security", false)
shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client")
shellOptions.FilerHost = "localhost"
shellOptions.FilerPort = 8888
shellOptions.Directory = "/"
shell.RunShell(shellOptions)
return true
}
}