summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-01-20 13:47:07 +0000
committerfukachan <fukachan>2002-01-20 13:47:07 +0000
commite8e4e70704f89e4faeb7df60a9fd55c6b111b673 (patch)
tree91e0f00d62b9fbf200088498cc3926596ae937d8
parent81391e3caee5def8d0c3070d2b2d6b9b94a0bcec (diff)
downloadfml8-e8e4e70704f89e4faeb7df60a9fd55c6b111b673.tar.gz
fml8-e8e4e70704f89e4faeb7df60a9fd55c6b111b673.tar.bz2
fml8-e8e4e70704f89e4faeb7df60a9fd55c6b111b673.zip
fix module loading of Mail::Delivery::Queue
-rw-r--r--fml/lib/FML/Process/Kernel.pm26
1 files changed, 16 insertions, 10 deletions
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;
+ }
}