gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: weed shell add filer runtime attributes

Browse Source
This commit is contained in:
shibinbin
2019-10-25 17:34:03 +08:00
parent 7de121d99b
commit 3464f21b5c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/command/shell.go
View File

@@ -14,6 +14,12 @@ var (
func init() { func init() {
cmdShell.Run = runShell // break init cycle cmdShell.Run = runShell // break init cycle
shellOptions.Masters = cmdShell.Flag.String("master", "localhost:9333", "comma-separated master servers") 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", 9333, "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{ var cmdShell = &Command{
@@ -24,17 +30,12 @@ var cmdShell = &Command{
`, `,
} }
var ()
func runShell(command *Command, args []string) bool { func runShell(command *Command, args []string) bool {
util.LoadConfiguration("security", false) util.LoadConfiguration("security", false)
shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client") shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client")
shellOptions.FilerHost = "localhost"
shellOptions.FilerPort = 8888
shellOptions.Directory = "/"
shell.RunShell(shellOptions) shell.RunShell(shellOptions)
return true return true