percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 05:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-73 Fixed help flag

Browse Source
This commit is contained in:
Carlos Salguero
2017-02-23 11:14:45 -03:00
parent 169cbbdec0
commit 4089b5e4c2
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/go/pt-mongodb-query-digest/main.go
View File

@@ -155,8 +155,7 @@ func main() {
log.Errorf("error processing commad line arguments: %s", err) log.Errorf("error processing commad line arguments: %s", err)
os.Exit(1) os.Exit(1)
} }
if opts.Help { if opts == nil && err == nil {
getopt.Usage()
return return
} }
@@ -540,7 +539,8 @@ func getOptions() (*options, error) {
gop.Parse(gop.Args()) gop.Parse(gop.Args())
} }
if opts.Help { if opts.Help {
return opts, nil gop.PrintUsage(os.Stdout)
return nil, nil
} }
if gop.IsSet("order-by") { if gop.IsSet("order-by") {

12
src/go/pt-mongodb-summary/main.go
View File

@@ -143,6 +143,9 @@ func main() {
log.Errorf("cannot get parameters: %s", err.Error()) log.Errorf("cannot get parameters: %s", err.Error())
os.Exit(2) os.Exit(2)
} }
if opts == nil && err == nil {
return
}
if opts.Help { if opts.Help {
getopt.Usage() getopt.Usage()
@@ -784,8 +787,8 @@ func externalIP() (string, error) {
return "", errors.New("are you connected to the network?") return "", errors.New("are you connected to the network?")
} }
func parseFlags() (options, error) { func parseFlags() (*options, error) {
opts := options{ opts := &options{
Host: DEFAULT_HOST, Host: DEFAULT_HOST,
LogLevel: DEFAULT_LOGLEVEL, LogLevel: DEFAULT_LOGLEVEL,
RunningOpsSamples: DEFAULT_RUNNINGOPSSAMPLES, RunningOpsSamples: DEFAULT_RUNNINGOPSSAMPLES,
@@ -828,6 +831,11 @@ func parseFlags() (options, error) {
} }
opts.Password = string(pass) opts.Password = string(pass)
} }
if opts.Help {
gop.PrintUsage(os.Stdout)
return nil, nil
}
return opts, nil return opts, nil
} }