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

Make Percona/Agent/Logger always log online.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-09 10:31:56 -07:00
parent 490a8a7c90
commit bcb3758f64
2 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
bin/pt-agent
View File

@@ -4824,13 +4824,6 @@ use Percona::WebAPI::Resource::LogEntry;
Transformers->import(qw(ts)); Transformers->import(qw(ts));
has 'level' => (
is => 'rw',
isa => 'Int',
required => 0,
default => sub { return 1; }, # info
);
has 'client' => ( has 'client' => (
is => 'rw', is => 'rw',
isa => 'Object', isa => 'Object',
@@ -4918,7 +4911,8 @@ sub enable_online_logging {
else { else {
$oktorun = 0; $oktorun = 0;
} }
} } # read log entries from queue
if ( scalar @log_entries ) { if ( scalar @log_entries ) {
eval { eval {
$client->post( $client->post(
@@ -4933,10 +4927,20 @@ sub enable_online_logging {
@log_entries = (); @log_entries = ();
} }
} # have log entries } # have log entries
if ( $oktorun ) { if ( $oktorun ) {
sleep $self->queue_wait; sleep $self->queue_wait;
} }
} # QUEUE } # QUEUE oktorun
if ( scalar @log_entries ) {
my $ts = ts(time, 0); # 0=local time
warn "$ts WARNING Failed to send these log entries (timestamps are UTC):\n";
foreach my $entry ( @log_entries ) {
warn sprintf("%s %s %s\n", $entry->[0], level_name($entry->[1]), $entry->[2]);
}
}
} # threads::async } # threads::async
); );
@@ -4956,29 +4960,36 @@ sub level_number {
: die "Invalid log level name: $name"; : die "Invalid log level name: $name";
} }
sub level_name {
my $number = shift;
die "No log level name given" unless $number;
my $name = $number == 1 ? 'DEBUG'
: $number == 2 ? 'INFO'
: $number == 3 ? 'WARNING'
: $number == 4 ? 'ERROR'
: $number == 5 ? 'FATAL'
: die "Invalid log level number: $number";
}
sub debug { sub debug {
my $self = shift; my $self = shift;
return unless $self->level >= 1;
return $self->_log('DEBUG', @_); return $self->_log('DEBUG', @_);
} }
sub info { sub info {
my $self = shift; my $self = shift;
return unless $self->level >= 2;
return $self->_log('INFO', @_); return $self->_log('INFO', @_);
} }
sub warn { sub warning {
my $self = shift; my $self = shift;
$self->_set_exit_status(); $self->_set_exit_status();
return unless $self->level >= 3;
return $self->_log('WARNING', @_); return $self->_log('WARNING', @_);
} }
sub error { sub error {
my $self = shift; my $self = shift;
$self->_set_exit_status(); $self->_set_exit_status();
return unless $self->level >= 4;
return $self->_log('ERROR', @_); return $self->_log('ERROR', @_);
} }
@@ -4999,36 +5010,34 @@ sub _set_exit_status {
sub _log { sub _log {
my ($self, $level, $msg) = @_; my ($self, $level, $msg) = @_;
chomp($msg); chomp($msg);
my $ts = ts(time, 1); # 1=UTC my $ts = ts(time, 1); # 1=UTC
my $level_number = level_number($level); my $level_number = level_number($level);
if ( $level_number >= 3 ) { # warning
print STDERR "$ts $level $msg\n"; my @event :shared = ($ts, $level_number, $msg);
} $self->_message_queue->enqueue(\@event);
else {
print "$ts $level $msg\n"; if ( !$self->online_logging ) {
} my $ts = ts(time, 0); # 0=local time
if ( $self->online_logging ) { if ( $level_number >= 3 ) { # warning
my @event :shared = ($ts, $level_number, $msg); print STDERR "$ts $level $msg\n";
$self->_message_queue->enqueue(\@event); }
else {
print "$ts $level $msg\n";
}
} }
return; return;
} }
sub stop_online_logging { sub DESTROY {
my $self = shift; my $self = shift;
if ( $self->_thread && $self->_thread->is_running() ) { if ( $self->_thread && $self->_thread->is_running() ) {
my @stop :shared = (undef, undef); my @stop :shared = (undef, undef);
$self->_message_queue->enqueue(\@stop); # stop the thread $self->_message_queue->enqueue(\@stop); # stop the thread
$self->_thread->join(); $self->_thread->join();
} }
$self->online_logging(0);
return;
}
sub DESTROY {
my $self = shift;
$self->stop_online_logging();
return; return;
} }

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

@@ -35,13 +35,6 @@ use Percona::WebAPI::Resource::LogEntry;
Transformers->import(qw(ts)); Transformers->import(qw(ts));
has 'level' => (
is => 'rw',
isa => 'Int',
required => 0,
default => sub { return 1; }, # info
);
has 'client' => ( has 'client' => (
is => 'rw', is => 'rw',
isa => 'Object', isa => 'Object',
@@ -117,7 +110,7 @@ sub enable_online_logging {
&& $max_log_entries-- && $max_log_entries--
&& (my $entry = $self->_message_queue->dequeue()) ) && (my $entry = $self->_message_queue->dequeue()) )
{ {
# $entry = [ level, "message" ] # $entry = [ ts, level, "message" ]
if ( defined $entry->[0] ) { if ( defined $entry->[0] ) {
push @log_entries, Percona::WebAPI::Resource::LogEntry->new( push @log_entries, Percona::WebAPI::Resource::LogEntry->new(
entry_ts => $entry->[0], entry_ts => $entry->[0],
@@ -128,10 +121,11 @@ sub enable_online_logging {
); );
} }
else { else {
# Got "stop" entry: [ undef, undef ] # Got "stop" entry: [ undef, undef, undef ]
$oktorun = 0; $oktorun = 0;
} }
} } # read log entries from queue
if ( scalar @log_entries ) { if ( scalar @log_entries ) {
eval { eval {
$client->post( $client->post(
@@ -146,10 +140,20 @@ sub enable_online_logging {
@log_entries = (); @log_entries = ();
} }
} # have log entries } # have log entries
if ( $oktorun ) { if ( $oktorun ) {
sleep $self->queue_wait; sleep $self->queue_wait;
} }
} # QUEUE } # QUEUE oktorun
if ( scalar @log_entries ) {
my $ts = ts(time, 0); # 0=local time
warn "$ts WARNING Failed to send these log entries (timestamps are UTC):\n";
foreach my $entry ( @log_entries ) {
warn sprintf("%s %s %s\n", $entry->[0], level_name($entry->[1]), $entry->[2]);
}
}
} # threads::async } # threads::async
); );
@@ -169,29 +173,36 @@ sub level_number {
: die "Invalid log level name: $name"; : die "Invalid log level name: $name";
} }
sub level_name {
my $number = shift;
die "No log level name given" unless $number;
my $name = $number == 1 ? 'DEBUG'
: $number == 2 ? 'INFO'
: $number == 3 ? 'WARNING'
: $number == 4 ? 'ERROR'
: $number == 5 ? 'FATAL'
: die "Invalid log level number: $number";
}
sub debug { sub debug {
my $self = shift; my $self = shift;
return unless $self->level >= 1;
return $self->_log('DEBUG', @_); return $self->_log('DEBUG', @_);
} }
sub info { sub info {
my $self = shift; my $self = shift;
return unless $self->level >= 2;
return $self->_log('INFO', @_); return $self->_log('INFO', @_);
} }
sub warn { sub warning {
my $self = shift; my $self = shift;
$self->_set_exit_status(); $self->_set_exit_status();
return unless $self->level >= 3;
return $self->_log('WARNING', @_); return $self->_log('WARNING', @_);
} }
sub error { sub error {
my $self = shift; my $self = shift;
$self->_set_exit_status(); $self->_set_exit_status();
return unless $self->level >= 4;
return $self->_log('ERROR', @_); return $self->_log('ERROR', @_);
} }
@@ -213,36 +224,34 @@ sub _set_exit_status {
sub _log { sub _log {
my ($self, $level, $msg) = @_; my ($self, $level, $msg) = @_;
chomp($msg); chomp($msg);
my $ts = ts(time, 1); # 1=UTC my $ts = ts(time, 1); # 1=UTC
my $level_number = level_number($level); my $level_number = level_number($level);
if ( $level_number >= 3 ) { # warning
print STDERR "$ts $level $msg\n"; my @event :shared = ($ts, $level_number, $msg);
} $self->_message_queue->enqueue(\@event);
else {
print "$ts $level $msg\n"; if ( !$self->online_logging ) {
} my $ts = ts(time, 0); # 0=local time
if ( $self->online_logging ) { if ( $level_number >= 3 ) { # warning
my @event :shared = ($ts, $level_number, $msg); print STDERR "$ts $level $msg\n";
$self->_message_queue->enqueue(\@event); }
else {
print "$ts $level $msg\n";
}
} }
return; return;
} }
sub stop_online_logging { sub DESTROY {
my $self = shift; my $self = shift;
if ( $self->_thread && $self->_thread->is_running() ) { if ( $self->_thread && $self->_thread->is_running() ) {
my @stop :shared = (undef, undef); my @stop :shared = (undef, undef);
$self->_message_queue->enqueue(\@stop); # stop the thread $self->_message_queue->enqueue(\@stop); # stop the thread
$self->_thread->join(); $self->_thread->join();
} }
$self->online_logging(0);
return;
}
sub DESTROY {
my $self = shift;
$self->stop_online_logging();
return; return;
} }