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

Fix stopping the logging thread on Ctrl-C, I think.

Browse Source
This commit is contained in:
Daniel Nichter
2013-05-19 12:09:51 -07:00
parent 5e2133e978
commit 52d9a91b4d
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,12 +98,17 @@ sub enable_online_logging {
&& $max_log_entries--
&& (my $entry = $self->_message_queue->dequeue()) )
{
$oktorun = 0 if !defined $entry;
# $event = [ level, "message" ]
push @log_entries, Percona::WebAPI::Resource::LogEntry->new(
log_level => $entry->[0],
message => $entry->[1],
);
# $entry = [ level, "message" ]
if ( scalar @$entry ) {
push @log_entries, Percona::WebAPI::Resource::LogEntry->new(
log_level => $entry->[0],
message => $entry->[1],
);
}
else {
# empty entry = stop
$oktorun = 0;
}
}
if ( scalar @log_entries ) {
eval {
@@ -119,7 +124,9 @@ sub enable_online_logging {
@log_entries = ();
}
} # have log entries
sleep ($self->_message_queue ? 3 : 5);
if ( $oktorun ) {
sleep ($self->_message_queue ? 3 : 5);
}
} # QUEUE
} # threads::async
);
@@ -202,8 +209,8 @@ sub _log {
sub DESTROY {
my $self = shift;
if ( $self->_message_queue ) {
$self->_message_queue->enqueue(undef); # stop thread's while loop
if ( $self->online_logging ) {
$self->_message_queue->enqueue( () ); # stop thread's while loop
$self->_thread->join();
}
return;