diff options
| author | fukachan <fukachan> | 2006-06-13 09:00:12 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-06-13 09:00:12 +0000 |
| commit | 0d032bd3ab90b6189b809401906d4f6341f5de2d (patch) | |
| tree | 03d46278e1881f4f80e65fe46e8305c71b494ee4 /regress | |
| parent | 78fa99473fd6fa2241d78883f44b6c1d6c854d02 (diff) | |
| download | fml8-0d032bd3ab90b6189b809401906d4f6341f5de2d.tar.gz fml8-0d032bd3ab90b6189b809401906d4f6341f5de2d.tar.bz2 fml8-0d032bd3ab90b6189b809401906d4f6341f5de2d.zip | |
more log messages.
more assertion.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/tinymta/Drop.pm | 5 | ||||
| -rw-r--r-- | regress/tinymta/SMTP.pm | 21 |
2 files changed, 21 insertions, 5 deletions
diff --git a/regress/tinymta/Drop.pm b/regress/tinymta/Drop.pm index a6ec0fd2..9135079d 100644 --- a/regress/tinymta/Drop.pm +++ b/regress/tinymta/Drop.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: Drop.pm,v 1.1.1.1 2006/06/10 01:05:10 fukachan Exp $ +# $FML: Drop.pm,v 1.2 2006/06/12 22:53:06 fukachan Exp $ # package TinyMTA::Drop; @@ -86,6 +86,9 @@ sub run croak("cannot create $qf\n"); } } + else { + $self->logerror("0 byte tmp file: $qtmp"); + } } diff --git a/regress/tinymta/SMTP.pm b/regress/tinymta/SMTP.pm index 406458e5..0c610a60 100644 --- a/regress/tinymta/SMTP.pm +++ b/regress/tinymta/SMTP.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: SMTP.pm,v 1.1.1.1 2006/06/10 01:05:11 fukachan Exp $ +# $FML: SMTP.pm,v 1.2 2006/06/12 22:49:46 fukachan Exp $ # package TinyMTA::SMTP; @@ -146,8 +146,20 @@ sub _send_file use Mail::Message; my $message = Mail::Message->parse( { file => $queue_file } ); + unless (defined $message) { + $self->logerror("undefined message"); + return 0; + } my ($sender, $rcpt_maps) = $self->_analyze_message($message); + unless ($sender) { + $self->logerror("no sender"); + return 0; + } + unless (@$rcpt_maps) { + $self->logerror("no recipient"); + return 0; + } use Mail::Delivery::Queue; my $queue = new Mail::Delivery::Queue { directory => $queue_dir }; @@ -203,11 +215,12 @@ sub _send_file } # done. + use File::Basename; + my $qid = basename($queue_file); + $qid =~ s/^_//; + unlink $queue_file; unless (-f $queue_file) { - use File::Basename; - my $qid = basename($queue_file); - $qid =~ s/^_//; $self->log("$qid removed"); } else { |