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

Don't keep the _qp around - just pass it in to each hook.

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@179 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2003-11-02 11:13:08 +00:00
parent b442d002f1
commit 03b8cda2b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Qpsmtpd.pm
View File

@ -2,7 +2,7 @@ package Qpsmtpd;
use strict;
$Qpsmtpd::VERSION = "0.27-dev";
sub TRACE_LEVEL { 6 }
sub TRACE_LEVEL () { 6 }
use Sys::Hostname;
use Qpsmtpd::Constants;
@ -88,7 +88,6 @@ sub get_qmail_config {
}
sub load_plugins {
my $self = shift;
my @plugins = $self->config('plugins');
@ -100,7 +99,7 @@ sub load_plugins {
for my $plugin (@plugins) {
$self->log(7, "Loading $plugin");
($plugin, my @args) = split /\s+/, $plugin;
my $plugin_name = $plugin;
# Escape everything into valid perl identifiers
@ -116,7 +115,7 @@ sub load_plugins {
# don't reload plugins if they are already loaded
next if defined &{"Qpsmtpd::Plugin::${plugin_name}::register"};
my $sub;
open F, "$dir/$plugin" or die "could not open $dir/$plugin: $!";
{
@ -163,7 +162,7 @@ sub run_hooks {
my @r;
for my $code (@{$self->{_hooks}->{$hook}}) {
$self->log(5, "running plugin ", $code->{name});
eval { (@r) = &{$code->{code}}($self->can('transaction') ? $self->transaction : {}, @_); };
eval { (@r) = $code->{code}->($self, $self->can('transaction') ? $self->transaction : {}, @_); };
$@ and $self->log(0, "FATAL PLUGIN ERROR: ", $@) and next;
!defined $r[0]
and $self->log(1, "plugin ".$code->{name}

3
lib/Qpsmtpd/Plugin.pm
View File

@ -12,10 +12,11 @@ sub register_hook {
my ($plugin, $hook, $method) = @_;
# I can't quite decide if it's better to parse this code ref or if
# we should pass the plugin object and method name ... hmn.
$plugin->qp->_register_hook($hook, { code => sub { $plugin->$method(@_) },
$plugin->qp->_register_hook($hook, { code => sub { local $plugin->{_qp} = shift; $plugin->$method(@_) },
name => $plugin->plugin_name
}
);
delete $plugin->{_qp};
}
sub qp {