re
/
ledisdb
forked from mirror/ledisdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix display of db number out of range

This commit is contained in:
holys 2014-07-17 12:06:07 +08:00
parent c85844629c
commit 82711d6fa8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/ledis-cli/main.go
View File

@ -12,7 +12,7 @@ import (
var ip = flag.String("h", "127.0.0.1", "ledisdb server ip (default 127.0.0.1)") var ip = flag.String("h", "127.0.0.1", "ledisdb server ip (default 127.0.0.1)")
var port = flag.Int("p", 6380, "ledisdb server port (default 6380)") var port = flag.Int("p", 6380, "ledisdb server port (default 6380)")
var socket = flag.String("s", "", "ledisdb server socket, overwrite ip and port") var socket = flag.String("s", "", "ledisdb server socket, overwrite ip and port")
var dbnum = flag.Int("n", 0, "ledisdb database number(default 0)") var dbn = flag.Int("n", 0, "ledisdb database number(default 0)")
func main() { func main() {
flag.Parse() flag.Parse()
@ -35,8 +35,12 @@ func main() {
prompt := "" prompt := ""
for { for {
if *dbnum != 0 { if *dbn >= 16 {
prompt = fmt.Sprintf("%s[%d]>", cfg.Addr, *dbnum) fmt.Printf("ERR invalid db index %d. Auto switch back db 0.\n", *dbn)
*dbn = 0
continue
} else if *dbn > 0 && *dbn < 16 {
prompt = fmt.Sprintf("%s[%d]>", cfg.Addr, *dbn)
} else { } else {
prompt = fmt.Sprintf("%s>", cfg.Addr) prompt = fmt.Sprintf("%s>", cfg.Addr)
} }
@ -58,11 +62,12 @@ func main() {
args[i] = strings.Trim(string(cmds[1+i]), "\"'") args[i] = strings.Trim(string(cmds[1+i]), "\"'")
} }
r, err := c.Do(cmds[0], args...) r, err := c.Do(cmds[0], args...)
if strings.ToLower(cmds[0]) == "select" {
*dbnum, _ = strconv.Atoi(cmds[1])
}
if err != nil { if err != nil {
fmt.Printf("%s", err.Error()) fmt.Printf("%s", err.Error())
} else if nb, _ := strconv.Atoi(cmds[1]); strings.ToLower(cmds[0]) == "select" && nb < 16 {
*dbn = nb
printReply(cmd, r)
} else { } else {
printReply(cmd, r) printReply(cmd, r)
} }