gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

support semicolon seperated command lines

Browse source
This commit is contained in:
Chris Lu 2020-04-23 14:01:46 -07:00
parent 73564e6a01
commit 662b5d0cf7
2 changed files with 62 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
weed/server/master_server.go
View file

@ -236,10 +236,19 @@ func (ms *MasterServer) startAdminScripts() {
for range c {
if ms.Topo.IsLeader() {
for _, line := range scriptLines {
for _, c := range strings.Split(line, ";") {
processEachCmd(reg, c, commandEnv)
}
}
}
}
}()
}
func processEachCmd(reg *regexp.Regexp, line string, commandEnv *shell.CommandEnv) {
cmds := reg.FindAllString(line, -1)
if len(cmds) == 0 {
continue
return
}
args := make([]string, len(cmds[1:]))
for i := range args {
@ -255,10 +264,6 @@ func (ms *MasterServer) startAdminScripts() {
}
}
}
}
}
}
}()
}
func (ms *MasterServer) createSequencer(option *MasterOption) sequence.Sequencer {

15
weed/shell/shell_liner.go
View file

@ -45,9 +45,18 @@ func RunShell(options ShellOptions) {
return
}
for _, c := range strings.Split(cmd, ";") {
if processEachCmd(reg, c, commandEnv) {
return
}
}
}
}
func processEachCmd(reg *regexp.Regexp, cmd string, commandEnv *CommandEnv) bool {
cmds := reg.FindAllString(cmd, -1)
if len(cmds) == 0 {
continue
return false
} else {
line.AppendHistory(cmd)
@ -61,7 +70,7 @@ func RunShell(options ShellOptions) {
if cmd == "help" || cmd == "?" {
printHelp(cmds)
} else if cmd == "exit" || cmd == "quit" {
return
return true
} else {
foundCommand := false
for _, c := range Commands {
@ -78,7 +87,7 @@ func RunShell(options ShellOptions) {
}
}
}
return false
}
func printGenericHelp() {