Remove --daemonize from pt-config-diff.

This commit is contained in:
Daniel Nichter
2013-02-26 16:57:02 -07:00
parent ae5280c232
commit aed0140d64

View File

@@ -5051,12 +5051,7 @@ sub main {
# Daemonize now that everything is setup and ready to work. # Daemonize now that everything is setup and ready to work.
# ######################################################################## # ########################################################################
my $daemon; my $daemon;
if ( $o->get('daemonize') ) { if ( $o->get('pid') ) {
$daemon = new Daemon(o=>$o);
$daemon->daemonize();
PTDEBUG && _d('I am a daemon now');
}
elsif ( $o->get('pid') ) {
# We're not daemoninzing, it just handles PID stuff. # We're not daemoninzing, it just handles PID stuff.
$daemon = new Daemon(o=>$o); $daemon = new Daemon(o=>$o);
$daemon->make_PID_file(); $daemon->make_PID_file();
@@ -5147,7 +5142,7 @@ pt-config-diff - Diff MySQL configuration files and server variables.
=head1 SYNOPSIS =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. 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. 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; first option on the command line. (This option does not specify a CONFIG;
it's equivalent to C<--defaults-file>.) 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 =item --defaults-file
short form: -F; type: string short form: -F; type: string
@@ -5305,11 +5295,11 @@ Password to use for connection.
type: string type: string
Create the given PID file when daemonized. The file contains the process Create the given PID file. The tool won't start if the PID file already
ID of the daemonized instance. The PID file is removed when the exists and the PID it contains is different than the current PID. However,
daemonized instance exits. The program checks for the existence of the if the PID file exists and the PID it contains is no longer running, the
PID file when starting; if it exists and the process with the matching PID tool will overwrite the PID file with the current PID. The PID file is
exists, the program exits. removed automatically when the tool exits.
=item --port =item --port