byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More small performance optimisations

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@841 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2008-02-01 19:06:35 +00:00
parent 5f6d3dba0d
commit 3553eee269
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/Qpsmtpd.pm
View File

@ -291,7 +291,7 @@ sub load_plugins {
my @loaded; my @loaded;
if ($hooks->{queue}) { if ($hooks->{queue}) {
$self->log(LOGWARN, "Plugins already loaded"); #$self->log(LOGWARN, "Plugins already loaded");
return @plugins; return @plugins;
} }
@ -412,51 +412,47 @@ sub run_continuation {
my $code = shift @$todo; my $code = shift @$todo;
#my $t2 = $SAMPLER->($hook . "_" . $code->{name}, undef, 1); #my $t2 = $SAMPLER->($hook . "_" . $code->{name}, undef, 1);
#warn("Got sampler called: ${hook}_$code->{name}\n"); #warn("Got sampler called: ${hook}_$code->{name}\n");
if ( $hook eq 'logging' ) { # without calling $self->log() $self->varlog(LOGDEBUG, $hook, $code->{name});
eval { (@r) = $code->{code}->($self, $self->transaction, @$args); }; my $tran = $self->transaction;
$@ and warn("FATAL LOGGING PLUGIN ERROR: ", $@) and next; eval { (@r) = $code->{code}->($self, $tran, @$args); };
} $@ and $self->log(LOGCRIT, "FATAL PLUGIN ERROR: ", $@) and next;
else {
$self->varlog(LOGDEBUG, $hook, $code->{name});
eval { (@r) = $code->{code}->($self, $self->transaction, @$args); };
$@ and $self->log(LOGCRIT, "FATAL PLUGIN ERROR: ", $@) and next;
!defined $r[0] !defined $r[0]
and $self->log(LOGERROR, "plugin ".$code->{name} and $self->log(LOGERROR, "plugin ".$code->{name}
." running the $hook hook returned undef!") ." running the $hook hook returned undef!")
and next; and next;
if ($self->transaction) { # note this is wrong as $tran is always true in the
my $tnotes = $self->transaction->notes( $code->{name} ); # current code...
$tnotes->{"hook_$hook"}->{'return'} = $r[0] if ($tran) {
if (!defined $tnotes || ref $tnotes eq "HASH"); my $tnotes = $tran->notes( $code->{name} );
} $tnotes->{"hook_$hook"}->{'return'} = $r[0]
else { if (!defined $tnotes || ref $tnotes eq "HASH");
my $cnotes = $self->connection->notes( $code->{name} ); }
$cnotes->{"hook_$hook"}->{'return'} = $r[0] else {
if (!defined $cnotes || ref $cnotes eq "HASH"); my $cnotes = $self->connection->notes( $code->{name} );
} $cnotes->{"hook_$hook"}->{'return'} = $r[0]
if (!defined $cnotes || ref $cnotes eq "HASH");
}
if ($r[0] == YIELD) { if ($r[0] == YIELD) {
$self->pause_read() if $self->isa('Danga::Client'); $self->pause_read() if $self->isa('Danga::Client');
$self->{_continuation} = [$hook, $args, @$todo]; $self->{_continuation} = [$hook, $args, @$todo];
return @r; return @r;
} }
elsif ($r[0] == DENY or $r[0] == DENYSOFT or elsif ($r[0] == DENY or $r[0] == DENYSOFT or
$r[0] == DENY_DISCONNECT or $r[0] == DENYSOFT_DISCONNECT) $r[0] == DENY_DISCONNECT or $r[0] == DENYSOFT_DISCONNECT)
{ {
$r[1] = "" if not defined $r[1]; $r[1] = "" if not defined $r[1];
$self->log(LOGDEBUG, "Plugin ".$code->{name}. $self->log(LOGDEBUG, "Plugin ".$code->{name}.
", hook $hook returned ".return_code($r[0]).", $r[1]"); ", hook $hook returned ".return_code($r[0]).", $r[1]");
$self->run_hooks_no_respond("deny", $code->{name}, $r[0], $r[1]) unless ($hook eq "deny"); $self->run_hooks_no_respond("deny", $code->{name}, $r[0], $r[1]) unless ($hook eq "deny");
} }
else { else {
$r[1] = "" if not defined $r[1]; $r[1] = "" if not defined $r[1];
$self->log(LOGDEBUG, "Plugin ".$code->{name}. $self->log(LOGDEBUG, "Plugin ".$code->{name}.
", hook $hook returned ".return_code($r[0]).", $r[1]"); ", hook $hook returned ".return_code($r[0]).", $r[1]");
$self->run_hooks_no_respond("ok", $code->{name}, $r[0], $r[1]) unless ($hook eq "ok"); $self->run_hooks_no_respond("ok", $code->{name}, $r[0], $r[1]) unless ($hook eq "ok");
}
} }
last unless $r[0] == DECLINED; last unless $r[0] == DECLINED;