X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=main.go;h=711cfff031b715cccccd8544401a39d897c81594;hb=41618ce7eb48b0a4d864a765d6f55a71382caea4;hp=5064de52818578ecf836da5e586a3eb3f6f72a39;hpb=1ae912ea9472be78cbf181870cc02cbe183aba14;p=pstop.git diff --git a/main.go b/main.go index 5064de5..711cfff 100644 --- a/main.go +++ b/main.go @@ -18,16 +18,16 @@ import ( ) var ( + cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file") flag_debug = flag.Bool("debug", false, "Enabling debug logging") flag_defaults_file = flag.String("defaults-file", "", "Provide a defaults-file to use to connect to MySQL") flag_help = flag.Bool("help", false, "Provide some help for "+lib.MyName()) flag_host = flag.String("host", "", "Provide the hostname of the MySQL to connect to") + flag_password = flag.String("password", "", "Provide the password when connecting to the MySQL server") flag_port = flag.Int("port", 0, "Provide the port number of the MySQL to connect to (default: 3306)") /* deliberately 0 here, defaults to 3306 elsewhere */ flag_socket = flag.String("socket", "", "Provide the path to the local MySQL server to connect to") - flag_password = flag.String("password", "", "Provide the password when connecting to the MySQL server") flag_user = flag.String("user", "", "Provide the username to connect with to MySQL (default: $USER)") flag_version = flag.Bool("version", false, "Show the version of "+lib.MyName()) - cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file") ) func usage() { @@ -43,14 +43,16 @@ func usage() { fmt.Println("--help Show this help message") fmt.Println("--version Show the version") fmt.Println("--host= MySQL host to connect to") + fmt.Println("--password= Password to use when connecting") fmt.Println("--port= MySQL port to connect to") fmt.Println("--socket= MySQL path of the socket to connect to") fmt.Println("--user= User to connect with") - fmt.Println("--password= Password to use when connecting") } func main() { + var connector connector.Connector var defaults_file string = "" + flag.Parse() // clean me up @@ -77,8 +79,6 @@ func main() { lib.Logger.Println("Starting " + lib.MyName()) - var connector connector.Connector - if *flag_host != "" || *flag_socket != "" { lib.Logger.Println("--host= or --socket= defined") var components = make(map[string]string)