proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-18 05:56:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use syncrounous IO for log writer

Browse Source
This commit is contained in:
Dietmar Maurer 2013-04-11 07:47:33 +02:00
parent 48c658a41c
commit c2e9823c0a
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/HTTPServer.pm
View File

@ -43,8 +43,6 @@ my $known_methods = {
sub log_request { sub log_request {
my ($self, $reqstate) = @_; my ($self, $reqstate) = @_;
return if !$self->{loghdl};
my $loginfo = $reqstate->{log}; my $loginfo = $reqstate->{log};
# like apache2 common log format # like apache2 common log format
@ -59,7 +57,7 @@ sub log_request {
my $msg = "$peerip - $userid [$timestr] \"$requestline\" $code $content_length\n"; my $msg = "$peerip - $userid [$timestr] \"$requestline\" $code $content_length\n";
$self->{loghdl}->push_write($msg); $self->write_log($msg);
} }
sub log_aborted_request { sub log_aborted_request {
@ -696,6 +694,9 @@ sub accept_connections {
$self->wait_end_loop() if $self->{end_loop}; $self->wait_end_loop() if $self->{end_loop};
} }
# Note: We can't open log file in non-blocking mode and use AnyEvent::Handle,
# because we write from multiple processes, and that would arbitrarily mix output
# of all processes.
sub open_access_log { sub open_access_log {
my ($self, $filename) = @_; my ($self, $filename) = @_;
@ -704,18 +705,23 @@ sub open_access_log {
die "unable to open log file '$filename' - $!\n"; die "unable to open log file '$filename' - $!\n";
umask($old_mask); umask($old_mask);
fh_nonblocking($logfh, 1); $logfh->autoflush(1);
$self->{loghdl} = AnyEvent::Handle->new(
fh => $logfh,
on_error => sub {
my ($hdl, $fatal, $msg) = @_;
syslog('err', "error writing access log: $msg");
delete $self->{loghdl};
$hdl->destroy;
$self->{end_loop} = 1; # terminate asap
});;
return; $self->{logfh} = $logfh;
}
sub write_log {
my ($self, $data) = @_;
return if !defined($self->{logfh}) || !$data;
my $res = $self->{logfh}->print($data);
if (!$res) {
delete $self->{logfh};
syslog('err', "error writing access log");
$self->{end_loop} = 1; # terminate asap
}
} }
sub new { sub new {
@ -745,7 +751,6 @@ sub new {
$self->{tls_ctx} = AnyEvent::TLS->new(%{$self->{ssl}}); $self->{tls_ctx} = AnyEvent::TLS->new(%{$self->{ssl}});
} }
# fixme: logrotate?
$self->open_access_log($self->{logfile}) if $self->{logfile}; $self->open_access_log($self->{logfile}) if $self->{logfile};
$self->{socket_watch} = AnyEvent->io(fh => $self->{socket}, poll => 'r', cb => sub { $self->{socket_watch} = AnyEvent->io(fh => $self->{socket}, poll => 'r', cb => sub {