Skip to content

Commit

Permalink
Fix pd-ctl help output (tikv#1763)
Browse files Browse the repository at this point in the history
Signed-off-by: lhy1024 <admin@liudos.us>

(cherry picked from commit 682b501)
Signed-off-by: lhy1024 <admin@liudos.us>
  • Loading branch information
lhy1024 committed Sep 26, 2019
1 parent 6e44953 commit d887a38
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions tools/pd-ctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,20 @@ var (
url string
detach bool
version bool
help bool
caPath string
certPath string
keyPath string
)

func init() {
flag.StringVarP(&url, "pd", "u", "http://127.0.0.1:2379", "The pd address")
flag.BoolVarP(&detach, "detach", "d", false, "Run pdctl without readline")
flag.BoolVarP(&version, "version", "V", false, "print version information and exit")
flag.StringVar(&caPath, "cacert", "", "path of file that contains list of trusted SSL CAs.")
flag.StringVar(&certPath, "cert", "", "path of file that contains X509 certificate in PEM format.")
flag.StringVar(&keyPath, "key", "", "path of file that contains X509 key in PEM format.")
flag.StringVarP(&url, "pd", "u", "http://127.0.0.1:2379", "The pd address.")
flag.BoolVarP(&detach, "detach", "d", false, "Run pdctl without readline.")
flag.BoolVarP(&version, "version", "V", false, "Print version information and exit.")
flag.StringVar(&caPath, "cacert", "", "The path of file that contains list of trusted SSL CAs.")
flag.StringVar(&certPath, "cert", "", "The path of file that contains X509 certificate in PEM format.")
flag.StringVar(&keyPath, "key", "", "The path of file that contains X509 key in PEM format.")
flag.BoolVarP(&help, "help", "h", false, "Help message.")
}

func main() {
Expand All @@ -55,6 +57,10 @@ func main() {
flag.CommandLine.ParseErrorsWhitelist.UnknownFlags = true
flag.Parse()

if help {
flag.Usage()
os.Exit(0)
}
if version {
server.PrintPDInfo()
os.Exit(0)
Expand Down

0 comments on commit d887a38

Please sign in to comment.