Changeset 158

Show
Ignore:
Timestamp:
04/24/07 11:29:20 (2 years ago)
Author:
jfp
Message:

Error messages changed ...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryHandler.java

    r130 r158  
    217217            messages.add("Hello, this is the Jsmtpd mailer daemon, running on system "+runningHost); 
    218218            messages.add(""); 
    219             messages.add("I'm affraid I can't deliver your email to : "); 
     219            messages.add("I'm afraid I can't deliver your email to : "); 
    220220            for (Iterator iter = e.getRcpt().iterator(); iter.hasNext();) { 
    221221                Rcpt element = (Rcpt) iter.next(); 
    …… 
    224224            } 
    225225            messages.add(""); 
    226             messages.add("This is a fatal error, giving up"); 
    227             Email error = Email.createInternalMail(e.getFrom(), "Mailer-daemon, Error processing mail", messages, e); 
     226            messages.add("************************************"); 
     227            messages.add("* This is a fatal error, giving up *"); 
     228            messages.add("************************************"); 
     229            Email error = Email.createInternalMail(e.getFrom(), "Mailer-daemon, fatal error while processing mail", messages, e); 
    228230            attachMail(error,this.e); 
    229231            log.warn("Mail "+e.getDiskName()+" has fatal delivery errors, sending errors back to sender"); 
    …… 
    258260            messages.add(""); 
    259261            messages.add("I'll try to send your mail to temporary unavailable recipients, up to "+maxRetries+" times, trying each "+retryDelay+" minute(s)"); 
    260             Email error = Email.createInternalMail(e.getFrom(), "Jsmtpd warning, Problem sending your mail", messages, e); 
     262            Email error = Email.createInternalMail(e.getFrom(), "Mailer-daemon, mail delivery delayed", messages, e); 
    261263            attachMail(error,this.e); 
    262264            log.warn("Mail "+e.getDiskName()+" has temporary delivery errors, notifying sender");