diff --git a/bin/pt-config-diff b/bin/pt-config-diff index f4d7be39..7b219586 100755 --- a/bin/pt-config-diff +++ b/bin/pt-config-diff @@ -5051,12 +5051,7 @@ sub main { # Daemonize now that everything is setup and ready to work. # ######################################################################## my $daemon; - if ( $o->get('daemonize') ) { - $daemon = new Daemon(o=>$o); - $daemon->daemonize(); - PTDEBUG && _d('I am a daemon now'); - } - elsif ( $o->get('pid') ) { + if ( $o->get('pid') ) { # We're not daemoninzing, it just handles PID stuff. $daemon = new Daemon(o=>$o); $daemon->make_PID_file(); @@ -5147,7 +5142,7 @@ pt-config-diff - Diff MySQL configuration files and server variables. =head1 SYNOPSIS -Usage: pt-config-diff [OPTION...] CONFIG CONFIG [CONFIG...] +Usage: pt-config-diff [OPTIONS] CONFIG CONFIG [CONFIG...] pt-config-diff diffs MySQL configuration files and server variables. CONFIG can be a filename or a DSN. At least two CONFIG sources must be given. @@ -5267,11 +5262,6 @@ Read this comma-separated list of config files; if specified, this must be the first option on the command line. (This option does not specify a CONFIG; it's equivalent to C<--defaults-file>.) -=item --daemonize - -Fork to the background and detach from the shell. POSIX -operating systems only. - =item --defaults-file short form: -F; type: string @@ -5305,11 +5295,11 @@ Password to use for connection. type: string -Create the given PID file when daemonized. The file contains the process -ID of the daemonized instance. The PID file is removed when the -daemonized instance exits. The program checks for the existence of the -PID file when starting; if it exists and the process with the matching PID -exists, the program exits. +Create the given PID file. The tool won't start if the PID file already +exists and the PID it contains is different than the current PID. However, +if the PID file exists and the PID it contains is no longer running, the +tool will overwrite the PID file with the current PID. The PID file is +removed automatically when the tool exits. =item --port