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

Better config caching

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@821 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2007-12-03 17:44:14 +00:00
parent c837f5d611
commit 8700e5c6fe
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Qpsmtpd.pm
View File

@ -8,7 +8,12 @@ use Qpsmtpd::Constants;
$VERSION = "0.40-dev"; $VERSION = "0.40-dev";
my $hooks = {}; my $hooks = {};
my %defaults = (
me => hostname,
timeout => 1200,
);
my $_config_cache = {}; my $_config_cache = {};
clear_config_cache();
sub version { $VERSION }; sub version { $VERSION };
@ -94,6 +99,13 @@ sub varlog {
} }
} }
sub clear_config_cache {
$_config_cache = {};
for (keys %defaults) {
$_config_cache->{$_} = [$defaults{$_}];
}
}
# #
# method to get the configuration. It just calls get_qmail_config by # method to get the configuration. It just calls get_qmail_config by
# default, but it could be overwritten to look configuration up in a # default, but it could be overwritten to look configuration up in a
@ -102,12 +114,11 @@ sub varlog {
sub config { sub config {
my ($self, $c, $type) = @_; my ($self, $c, $type) = @_;
#warn "SELF->config($c) ", ref $self; if ($_config_cache->{$c}) {
return wantarray ? @{$_config_cache->{$c}} : $_config_cache->{$c}->[0];
}
my %defaults = ( #warn "SELF->config($c) ", ref $self;
me => hostname,
timeout => 1200,
);
my ($rc, @config) = $self->run_hooks("config", $c); my ($rc, @config) = $self->run_hooks("config", $c);
@config = () unless $rc == OK; @config = () unless $rc == OK;
@ -152,15 +163,15 @@ sub plugin_dirs {
sub get_qmail_config { sub get_qmail_config {
my ($self, $config, $type) = @_; my ($self, $config, $type) = @_;
$self->log(LOGDEBUG, "trying to get config for $config"); $self->log(LOGDEBUG, "trying to get config for $config");
if ($_config_cache->{$config}) {
return wantarray ? @{$_config_cache->{$config}} : $_config_cache->{$config}->[0];
}
my $configdir = $self->config_dir($config); my $configdir = $self->config_dir($config);
my $configfile = "$configdir/$config"; my $configfile = "$configdir/$config";
if ($type and $type eq "map") { if ($type and $type eq "map") {
return +{} unless -e $configfile . ".cdb"; unless (-e $configfile . ".cdb") {
$_config_cache->{$config} = [];
return +{};
}
eval { require CDB_File }; eval { require CDB_File };
if ($@) { if ($@) {
@ -183,7 +194,10 @@ sub get_qmail_config {
sub _config_from_file { sub _config_from_file {
my ($self, $configfile, $config, $visited) = @_; my ($self, $configfile, $config, $visited) = @_;
return unless -e $configfile; unless (-e $configfile) {
$_config_cache->{$config} = [];
return;
}
$visited ||= []; $visited ||= [];
push @{$visited}, $configfile; push @{$visited}, $configfile;