Commit 70acb298 authored by sikeda's avatar sikeda
Browse files

[-dev] Obsoleting Sympa::Spindle::_spools().


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12590 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent ee74761d
......@@ -37,6 +37,7 @@ use Sympa::List;
use Sympa::Log;
use Sympa::Mailer;
use Sympa::Process;
use Sympa::Spool::Incoming;
use Sympa::Tools::Data;
use base qw(Sympa::Spindle);
......@@ -44,7 +45,6 @@ use base qw(Sympa::Spindle);
my $log = Sympa::Log->instance;
use constant _distaff => 'Sympa::Spool::Automatic';
use constant _spools => {spool => 'Sympa::Spool::Incoming'};
sub _init {
my $self = shift;
......@@ -370,7 +370,8 @@ sub _twist {
}
# Do not process messages in list creation. Move them to main spool.
my $marshalled = $self->{spool}->store($message, original => 1);
my $marshalled =
Sympa::Spool::Incoming->new->store($message, original => 1);
if ($marshalled) {
$log->syslog('notice',
'Message %s is stored into incoming spool as <%s>',
......@@ -460,10 +461,6 @@ See also L<Sympa::Spindle/"Properties">.
Instance of L<Sympa::Spool::Automatic> class.
=item {spool}
Instance of L<Sympa::Spool::Incoming> class.
=back
=head1 SEE ALSO
......
......@@ -30,6 +30,7 @@ use POSIX qw();
use Time::HiRes qw();
use Time::Local qw();
use Sympa::Bulk;
use Conf;
use Sympa::Language;
use Sympa::Log;
......@@ -46,7 +47,6 @@ use constant _on_failure => 1;
use constant _on_garbage => 1;
use constant _on_skip => 1;
use constant _on_success => 1;
use constant _spools => {spool => 'Sympa::Bulk'};
sub _twist {
my $self = shift;
......@@ -216,9 +216,12 @@ sub _distribute_digest {
}
}
}
unless ($digest_message
and defined $self->{spool}
->store($digest_message, $available_recipients->{$mode})) {
unless (
$digest_message
and Sympa::Bulk->new->store(
$digest_message, $available_recipients->{$mode}
)
) {
$log->syslog('notice',
'Unable to send template "%s" to %s list subscribers',
$mode, $list);
......@@ -330,10 +333,6 @@ See also L<Sympa::Spindle/"Properties">.
Instance of L<Sympa::Spool::Digest::Collection> class.
=item {spool}
Instance of L<Sympa::Bulk> class.
=back
=head1 SEE ALSO
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment