Changeset 13779 for branches/Release01x01/core/lib/Foswiki/Net.pm

Timestamp:

01/22/12 15:24:36 (4 months ago)

Author:

GeorgeClark

Message:

Item11462: Improve Net.pm error message handling

When run under configure, there is no Session. Calls to logger fail
masking other errors. Only call logger when there is a session.

Make sure every error is sent to STDERR.

File:

• branches/Release01x01/core/lib/Foswiki/Net.pm (modified) (5 diffs)

branches/Release01x01/core/lib/Foswiki/Net.pm

@@ -302 +302 @@
         eval "require $this->{MAIL_METHOD};";
         if ($@) {
-            print STDERR "FAILED $@ \n";
+            print STDERR ">>>> Failed to load $this->{MAIL_METHOD}: $@ \n";
             $this->{session}->logger->log( 'warning',
                 "$this->{MAIL_METHOD} not available: $@" )
@@ -385 +385 @@
             my $e = shift->stringify();
             ( my $to ) = $text =~ /^To:\s*(.*?)$/im;
-            $this->{session}->logger->log( 'warning', "Emailing $to - $e" )
+            $this->{session}
+              ->logger->log( 'warning', "Error sending email $to - $e" )
               if ( $this->{session} );
+            print STDERR ">>>> FAILURE Sending e-mail to $to - $e\n";
 
             # be nasty to errors that we didn't throw. They may be
@@ -454 +456 @@
         };
         if ($@) {
-            print STDERR "Crypt::SMIME Failed: $@ \n";
+            print STDERR ">>>> Crypt::SMIME Failed: $@ \n";
             $this->{session}->logger->log( 'warning', "S/MIME FAILED: $@" )
               if ( $this->{session} );
@@ -598 +600 @@
     die $mess . "Can't connect to '$this->{MAIL_HOST}'" unless $smtp;
 
-#print STDERR ">>>>>>>>>>>>> ABOUT TO AUTH with $Foswiki::cfg{SMTP}{Username} \n";
+    print STDERR
+">>>> SMTP auth: Attempting authentication for $Foswiki::cfg{SMTP}{Username} \n"
+      if ( $Foswiki::cfg{SMTP}{Debug} && $Foswiki::cfg{SMTP}{Username} );
 
     if ( $Foswiki::cfg{SMTP}{Username}
         && !( $this->{MAIL_METHOD} eq 'Net::SMTP::TLS' ) )
     {
+        unless ( $Foswiki::cfg{SMTP}{Password} ) {
+            my $errmsg =
+"SMTP auth: AUTH requested for $Foswiki::cfg{SMTP}{Username} but no password provided";
+            print STDERR ">>>> $errmsg \n" if $Foswiki::cfg{SMTP}{Debug};
+            $this->{session}->logger->log( 'warning', "$errmsg" )
+              if $this->{session};
+        }
 
         unless (
@@ -615 +626 @@
             chomp($errmsg);
             $errmsg .= ' - Trying to send without authentication';
-            $this->{session}->logger->log( 'warning', "$errmsg" );
+            $this->{session}->logger->log( 'warning', "$errmsg" )
+              if $this->{session};
+            print STDERR ">>>> FAILURE - $errmsg\n";
         }
     }