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

Allow online logging to be disabled.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-11 10:36:42 -07:00
parent 116adafbef
commit b40db4ac7b
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/pt-agent
View File

@@ -4855,6 +4855,13 @@ has 'data_ts' => (
); );
has 'online_logging' => ( has 'online_logging' => (
is => 'ro',
isa => 'Bool',
required => 0,
default => sub { return 1 },
);
has 'online_logging_enabled' => (
is => 'rw', is => 'rw',
isa => 'Bool', isa => 'Bool',
required => 0, required => 0,
@@ -4906,13 +4913,15 @@ sub start_online_logging {
my $log_link = $args{log_link}; my $log_link = $args{log_link};
my $read_timeout = $args{read_timeout} || 3; my $read_timeout = $args{read_timeout} || 3;
return unless $self->online_logging;
my $pid = open(my $pipe_write, "|-"); my $pid = open(my $pipe_write, "|-");
if ($pid) { if ($pid) {
select $pipe_write; select $pipe_write;
$OUTPUT_AUTOFLUSH = 1; $OUTPUT_AUTOFLUSH = 1;
$self->_pipe_write($pipe_write); $self->_pipe_write($pipe_write);
$self->online_logging(1); $self->online_logging_enabled(1);
} }
else { else {
my @log_entries; my @log_entries;
@@ -5044,16 +5053,17 @@ sub _log {
my $n_lines = 1; my $n_lines = 1;
$n_lines++ while $msg =~ m/\n/g; $n_lines++ while $msg =~ m/\n/g;
if ( $self->online_logging ) { if ( $self->online_logging_enabled ) {
while ( defined(my $log_entry = shift @{$self->_buffer}) ) { while ( defined(my $log_entry = shift @{$self->_buffer}) ) {
$self->_queue_log_entry(@$log_entry); $self->_queue_log_entry(@$log_entry);
} }
$self->_queue_log_entry($ts, $level_number, $n_lines, $msg); $self->_queue_log_entry($ts, $level_number, $n_lines, $msg);
} }
else { else {
if ( $self->online_logging ) {
push @{$self->_buffer}, [$ts, $level_number, $n_lines, $msg]; push @{$self->_buffer}, [$ts, $level_number, $n_lines, $msg];
}
my $ts = ts(time, 0); # 0=local time
if ( $level_number >= 3 ) { # warning if ( $level_number >= 3 ) { # warning
print STDERR "$ts $level $msg\n"; print STDERR "$ts $level $msg\n";
} }

16
lib/Percona/Agent/Logger.pm
View File

@@ -60,6 +60,13 @@ has 'data_ts' => (
); );
has 'online_logging' => ( has 'online_logging' => (
is => 'ro',
isa => 'Bool',
required => 0,
default => sub { return 1 },
);
has 'online_logging_enabled' => (
is => 'rw', is => 'rw',
isa => 'Bool', isa => 'Bool',
required => 0, required => 0,
@@ -112,6 +119,8 @@ sub start_online_logging {
my $log_link = $args{log_link}; my $log_link = $args{log_link};
my $read_timeout = $args{read_timeout} || 3; my $read_timeout = $args{read_timeout} || 3;
return unless $self->online_logging;
my $pid = open(my $pipe_write, "|-"); my $pid = open(my $pipe_write, "|-");
if ($pid) { if ($pid) {
@@ -119,7 +128,7 @@ sub start_online_logging {
select $pipe_write; select $pipe_write;
$OUTPUT_AUTOFLUSH = 1; $OUTPUT_AUTOFLUSH = 1;
$self->_pipe_write($pipe_write); $self->_pipe_write($pipe_write);
$self->online_logging(1); $self->online_logging_enabled(1);
} }
else { else {
# child # child
@@ -254,16 +263,17 @@ sub _log {
my $n_lines = 1; my $n_lines = 1;
$n_lines++ while $msg =~ m/\n/g; $n_lines++ while $msg =~ m/\n/g;
if ( $self->online_logging ) { if ( $self->online_logging_enabled ) {
while ( defined(my $log_entry = shift @{$self->_buffer}) ) { while ( defined(my $log_entry = shift @{$self->_buffer}) ) {
$self->_queue_log_entry(@$log_entry); $self->_queue_log_entry(@$log_entry);
} }
$self->_queue_log_entry($ts, $level_number, $n_lines, $msg); $self->_queue_log_entry($ts, $level_number, $n_lines, $msg);
} }
else { else {
if ( $self->online_logging ) {
push @{$self->_buffer}, [$ts, $level_number, $n_lines, $msg]; push @{$self->_buffer}, [$ts, $level_number, $n_lines, $msg];
}
my $ts = ts(time, 0); # 0=local time
if ( $level_number >= 3 ) { # warning if ( $level_number >= 3 ) { # warning
print STDERR "$ts $level $msg\n"; print STDERR "$ts $level $msg\n";
} }