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

simplify config->from_file by not requiring full

Browse Source 
file path. Instead, figure it out the same way as the 4 of the 5 caller do (by calling config_dir). Allow the 2nd arg to be the file name.
This commit is contained in:
Matt Simerson 2014-09-17 09:11:47 -07:00
parent 1e5d249224
commit 519bb12503
3 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Qpsmtpd.pm
View File

@ -6,7 +6,7 @@ our $VERSION = '0.95';
use vars qw($TraceLevel $Spool_dir $Size_threshold);
use lib 'lib';
use base 'Qpsmtpd::Base';
use parent 'Qpsmtpd::Base';
use Qpsmtpd::Address;
use Qpsmtpd::Config;
use Qpsmtpd::Constants;
@ -56,35 +56,24 @@ sub hooks {
sub load_logging {
my $self = shift;
# avoid triggering log activity
return if ($LOGGING_LOADED || $hooks->{'logging'});
return if $LOGGING_LOADED; # already done
return if $hooks->{'logging'}; # avoid triggering log activity
my $configdir = $self->config_dir("logging");
my $configfile = "$configdir/logging";
my @loggers = $self->conf->from_file($configfile, 'logging');
$configdir = $self->config_dir('plugin_dirs');
$configfile = "$configdir/plugin_dirs";
my @plugin_dirs = $self->conf->from_file($configfile, 'plugin_dirs');
unless (@plugin_dirs) {
my @plugin_dirs = $self->conf->from_file('plugin_dirs');
if (!@plugin_dirs) {
my ($name) = ($0 =~ m!(.*?)/([^/]+)$!);
@plugin_dirs = ("$name/plugins");
}
my @loaded;
my @loggers = $self->conf->from_file('logging');
for my $logger (@loggers) {
push @loaded, $self->_load_plugin($logger, @plugin_dirs);
}
foreach my $logger (@loaded) {
$self->_load_plugin($logger, @plugin_dirs);
$self->log(LOGINFO, "Loaded $logger");
}
$configdir = $self->config_dir("loglevel");
$configfile = "$configdir/loglevel";
$TraceLevel = $self->conf->from_file($configfile, 'loglevel');
$TraceLevel = $self->conf->from_file('loglevel');
unless (defined($TraceLevel) and $TraceLevel =~ /^\d+$/) {
unless (defined($TraceLevel) && $TraceLevel =~ /^\d+$/) {
$TraceLevel = LOGWARN; # Default if no loglevel file found.
}

39
lib/Qpsmtpd/Config.pm
View File

@ -90,38 +90,35 @@ sub default {
sub get_qmail {
my ($self, $config, $type) = @_;
$self->log(LOGDEBUG, "trying to get config for $config");
my $configdir = $self->config_dir($config);
my $configfile = "$configdir/$config";
# CDB config support really should be moved to a plugin
if ($type and $type eq "map") {
return $self->get_qmail_map($config, $configfile);
return $self->get_qmail_map($config);
}
return $self->from_file($configfile, $config);
return $self->from_file($config);
}
sub get_qmail_map {
my ($self, $config, $configfile) = @_;
my ($self, $config, $file) = @_;
if (!-e $configfile . ".cdb") {
$self->log(LOGDEBUG, "File $configfile.cdb does not exist");
$file ||= $self->config_dir($config) . "/$config.cdb";
if (!-e $file) {
$self->log(LOGDEBUG, "File $file does not exist");
$config_cache{$config} ||= [];
return +{};
}
eval { require CDB_File };
if ($@) {
$self->log(LOGERROR,
"No CDB Support! Did NOT read $configfile.cdb, could not load CDB_File module: $@"
);
$self->log(LOGERROR, "No CDB Support! Did NOT read $file, could not load CDB_File: $@");
return +{};
}
my %h;
unless (tie(%h, 'CDB_File', "$configfile.cdb")) {
$self->log(LOGERROR, "tie of $configfile.cdb failed: $!");
unless (tie(%h, 'CDB_File', $file)) {
$self->log(LOGERROR, "tie of $file failed: $!");
return +{};
}
@ -132,17 +129,19 @@ sub get_qmail_map {
}
sub from_file {
my ($self, $configfile, $config, $visited) = @_;
if (!-e $configfile) {
my ($self, $config, $file, $visited) = @_;
$file ||= $self->config_dir($config) . "/$config";
if (!-e $file) {
$config_cache{$config} ||= [];
return;
}
$visited ||= [];
push @$visited, $configfile;
push @$visited, $file;
open my $CF, '<', $configfile or do {
warn "$$ could not open configfile $configfile: $!";
open my $CF, '<', $file or do {
warn "$$ could not open configfile $file: $!";
return;
};
my @config = <$CF>;
@ -180,8 +179,8 @@ sub from_file {
}
push @{$visited}, $inclusion;
for my $inc ($self->expand_inclusion($inclusion, $configfile)) {
my @insertion = $self->from_file($inc, $config, $visited);
for my $inc ($self->expand_inclusion($inclusion, $file)) {
my @insertion = $self->from_file($config, $inc, $visited);
splice @config, $pos, 0, @insertion; # insert the inclusion
$pos += @insertion;
}

4
t/qpsmtpd-config.t
View File

@ -94,7 +94,7 @@ sub __get_qmail {
sub __get_qmail_map {
eval "require CDB_File"; ## no critic (StringyEval)
if (!$@) {
my $r = $config->get_qmail_map('users', 't/config/users');
my $r = $config->get_qmail_map('users', 't/config/users.cdb');
ok(keys %$r, 'get_qmail_map("users.cdb")');
ok($r->{'!example.com-'}, "get_qmail_map, known entry");
};
@ -102,7 +102,7 @@ sub __get_qmail_map {
sub __from_file {
my $test_file = 't/config/test_config_file';
my @r = $config->from_file($test_file, 'test_config_file');
my @r = $config->from_file('test_config_file', $test_file);
ok( @r, "from_file, $test_file");
cmp_ok('1st line with content', 'eq', $r[0], "from_file string compare");
ok( !$r[1], "from_file");