From e8e4e70704f89e4faeb7df60a9fd55c6b111b673 Mon Sep 17 00:00:00 2001 From: fukachan Date: Sun, 20 Jan 2002 13:47:07 +0000 Subject: fix module loading of Mail::Delivery::Queue --- fml/lib/FML/Process/Kernel.pm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'fml') diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index 7ed15f85..e5d99b78 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Kernel.pm,v 1.69 2002/01/16 13:34:00 fukachan Exp $ +# $FML: Kernel.pm,v 1.70 2002/01/16 13:43:20 fukachan Exp $ # package FML::Process::Kernel; @@ -739,20 +739,26 @@ sub queue_in _add_info_on_header($config, $msg); } + my ($queue_dir, $queue, $qid) = (undef, undef, undef); eval q{ use Mail::Delivery::Queue; + $queue_dir = $config->{ mqueue_dir }; + $queue = new Mail::Delivery::Queue { directory => $queue_dir }; + $qid = $queue->id(); }; - my $queue_dir = $config->{ mqueue_dir }; - my $queue = new Mail::Delivery::Queue { directory => $queue_dir }; - my $qid = $queue->id(); - $queue->set('sender', $sender); - $queue->set('recipients', [ $recipient ]); - $queue->in( $msg ) && Log("queue=$qid in"); - $queue->setrunnable(); + if (defined $queue) { + $queue->set('sender', $sender); + $queue->set('recipients', [ $recipient ]); + $queue->in( $msg ) && Log("queue=$qid in"); + $queue->setrunnable(); - # return queue object - return $queue; + # return queue object + return $queue; + } + else { + return undef; + } } -- cgit v1.2.1