You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2014/02/04 05:44:52 UTC
svn commit: r1564194 - in /spamassassin/trunk:
build/announcements/PROPOSED-3.4.0.txt
lib/Mail/SpamAssassin/BayesStore/Redis.pm lib/Mail/SpamAssassin/Conf.pm
lib/Mail/SpamAssassin/Plugin/Bayes.pm
Author: kmcgrail
Date: Tue Feb 4 04:44:52 2014
New Revision: 1564194
URL: http://svn.apache.org/r1564194
Log:
reversal of r1557309 for bayes_store_module_additional conf option
Modified:
spamassassin/trunk/build/announcements/PROPOSED-3.4.0.txt
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
Modified: spamassassin/trunk/build/announcements/PROPOSED-3.4.0.txt
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/announcements/PROPOSED-3.4.0.txt?rev=1564194&r1=1564193&r2=1564194&view=diff
==============================================================================
--- spamassassin/trunk/build/announcements/PROPOSED-3.4.0.txt (original)
+++ spamassassin/trunk/build/announcements/PROPOSED-3.4.0.txt Tue Feb 4 04:44:52 2014
@@ -210,7 +210,6 @@ value 1 (i.e. enabled).
Example configuration:
bayes_store_module Mail::SpamAssassin::BayesStore::Redis
- bayes_store_module_additional Mail::SpamAssassin::Util::TinyRedis
bayes_sql_dsn server=127.0.0.1:6379;password=foo;database=2
bayes_token_ttl 21d
bayes_seen_ttl 8d
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1564194&r1=1564193&r2=1564194&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm Tue Feb 4 04:44:52 2014
@@ -53,7 +53,6 @@ value 1 (i.e. enabled).
Example configuration:
bayes_store_module Mail::SpamAssassin::BayesStore::Redis
- bayes_store_module_additional Mail::SpamAssassin::Util::TinyRedis
bayes_sql_dsn server=127.0.0.1:6379;password=foo;database=2
bayes_token_ttl 21d
bayes_seen_ttl 8d
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1564194&r1=1564193&r2=1564194&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Tue Feb 4 04:44:52 2014
@@ -3517,26 +3517,6 @@ module.
}
});
-=item bayes_store_module_additional Name::Of::Additional::BayesStore::Module
-
-If this option is set, the module given will loaded in addition to the
-bayes_store_module such as Redis.pm which also requires TinyRedis.pm.
-
-=cut
-
- push (@cmds, {
- setting => 'bayes_store_module_additional',
- is_admin => 1,
- default => '',
- type => $CONF_TYPE_STRING,
- code => sub {
- my ($self, $key, $value, $line) = @_;
- local ($1);
- if ($value !~ /^([_A-Za-z0-9:]+)$/) { return $INVALID_VALUE; }
- $self->{bayes_store_module_additional} = $1;
- }
- });
-
=item bayes_sql_dsn DBI::databasetype:databasename:hostname:port
Used for BayesStore::SQL storage implementation.
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm?rev=1564194&r1=1564193&r2=1564194&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm Tue Feb 4 04:44:52 2014
@@ -1574,15 +1574,9 @@ sub learner_new {
my $module = untaint_var($self->{conf}->{bayes_store_module});
$module = 'Mail::SpamAssassin::BayesStore::DBM' if !$module;
- #DO WE NEED TO LOAD A SECONDARY MODULE?
- my $additional_module = '';
- if (defined($self->{conf}->{bayes_store_module_additional}) && $self->{conf}->{bayes_store_module_additional} ne '') {
- $additional_module = "require ".untaint_var($self->{conf}->{bayes_store_module_additional}).";";
- }
-
dbg("bayes: learner_new self=%s, bayes_store_module=%s", $self,$module);
eval '
- require '.$module.'; '.$additional_module.'
+ require '.$module.';
$store = '.$module.'->new($self);
1;
' or do {