percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable online logging manually in Logger::enable_online_logging() instead of BUILD() because threads don't share data.

Browse Source
This commit is contained in:
Daniel Nichter
2013-05-17 09:59:20 -07:00
parent fe50f5d916
commit e8fc50dad1
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bin/pt-agent
View File

@@ -4843,8 +4843,17 @@ has '_thread' => (
required => 0, required => 0,
); );
sub BUILD { has 'online_logging' => (
my $self = shift; is => 'rw',
isa => 'Bool',
required => 0,
default => sub { return 0 },
);
sub enable_online_logging {
my ($self, %args) = @_;
my $client = $args{client};
my $log_link = $args{log_link};
$self->_message_queue(Thread::Queue->new()); $self->_message_queue(Thread::Queue->new());
@@ -4868,8 +4877,8 @@ sub BUILD {
} }
if ( scalar @log_entries ) { if ( scalar @log_entries ) {
eval { eval {
$self->client->post( $client->post(
link => $self->log_link, link => $log_link,
resources => \@log_entries, resources => \@log_entries,
); );
}; };
@@ -4885,6 +4894,8 @@ sub BUILD {
} # threads::async } # threads::async
); );
$self->online_logging(1);
return; return;
} }
@@ -4951,7 +4962,7 @@ sub _log {
else { else {
print "$ts $level $msg\n"; print "$ts $level $msg\n";
} }
if ( $self->client && $self->log_link ) { if ( $self->online_logging ) {
my @event :shared = ($level_number, $msg); my @event :shared = ($level_number, $msg);
$self->_message_queue->enqueue(\@event); $self->_message_queue->enqueue(\@event);
} }
@@ -5739,9 +5750,10 @@ These values can change if a different configuration is received.
# simple info("Hello world!") to STDOUT won't block if the API isn't # simple info("Hello world!") to STDOUT won't block if the API isn't
# responding. -- Both client and log_link are required to enable this. # responding. -- Both client and log_link are required to enable this.
if ( $agent->links->{log} && $logger_client ) { if ( $agent->links->{log} && $logger_client ) {
$logger->client($logger_client); $logger->enable_online_logging(
$logger->log_link($agent->links->{log}); client => $logger_client,
log_link => $agent->links->{log},
);
$logger->info("Online logging enabled"); $logger->info("Online logging enabled");
} }

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

@@ -72,8 +72,17 @@ has '_thread' => (
required => 0, required => 0,
); );
sub BUILD { has 'online_logging' => (
my $self = shift; is => 'rw',
isa => 'Bool',
required => 0,
default => sub { return 0 },
);
sub enable_online_logging {
my ($self, %args) = @_;
my $client = $args{client};
my $log_link = $args{log_link};
$self->_message_queue(Thread::Queue->new()); $self->_message_queue(Thread::Queue->new());
@@ -98,8 +107,8 @@ sub BUILD {
} }
if ( scalar @log_entries ) { if ( scalar @log_entries ) {
eval { eval {
$self->client->post( $client->post(
link => $self->log_link, link => $log_link,
resources => \@log_entries, resources => \@log_entries,
); );
}; };
@@ -115,6 +124,8 @@ sub BUILD {
} # threads::async } # threads::async
); );
$self->online_logging(1);
return; return;
} }
@@ -182,7 +193,7 @@ sub _log {
else { else {
print "$ts $level $msg\n"; print "$ts $level $msg\n";
} }
if ( $self->client && $self->log_link ) { if ( $self->online_logging ) {
my @event :shared = ($level_number, $msg); my @event :shared = ($level_number, $msg);
$self->_message_queue->enqueue(\@event); $self->_message_queue->enqueue(\@event);
} }