From: adam Date: Tue, 3 Aug 2004 07:14:56 +0000 (+0000) Subject: indented connection messages X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c270ffe5e407062942b774b5286c7e64797b3169;p=org.ibex.mail.git indented connection messages darcs-hash:20040803071456-5007d-3b6a1850abc020faaea6612023df68c0caa47d5b.gz --- diff --git a/src/org/ibex/mail/protocol/SMTP.java b/src/org/ibex/mail/protocol/SMTP.java index 23cfb68..33ff3a5 100644 --- a/src/org/ibex/mail/protocol/SMTP.java +++ b/src/org/ibex/mail/protocol/SMTP.java @@ -93,7 +93,7 @@ public class SMTP { private static final HashSet deadHosts = new HashSet(); public static void accept(Message m) throws IOException { if (m == null) { Log.warn(Outgoing.class, "attempted to accept(null)"); return; } - Log.info(SMTP.class, "queued:\n" + m.summary()); + //Log.info(SMTP.class, "queued: " + m.summary()); if (m.traces.length >= 100) Log.warn(SMTP.Outgoing.class, "Message with " + m.traces.length + " trace hops; dropping\n" + m.summary()); else synchronized(Outgoing.class) { @@ -132,7 +132,7 @@ public class SMTP { Log.info(SMTP.Outgoing.class, "connecting to " + mx + "..."); conn = new Connection(new Socket(mx, 25), InetAddress.getLocalHost().getHostName()); conn.setTimeout(60 * 1000); - Log.info(SMTP.Outgoing.class, "connected"); + Log.info(SMTP.Outgoing.class, " connected"); check(conn.readln(), conn); // banner conn.println("HELO " + conn.vhost); check(conn.readln(), conn); conn.println("MAIL FROM:<" + m.envelope.from.user + "@" + m.envelope.from.host+">"); check(conn.readln(), conn); @@ -141,12 +141,12 @@ public class SMTP { conn.println(m.toString()); conn.println("."); check(conn.readln(), conn); - Log.info(SMTP.Outgoing.class, "success: message accepted by " + mx); + Log.info(SMTP.Outgoing.class, " success: message accepted by " + mx); accepted = true; conn.close(); } catch (Exception e) { if (accepted) return true; - Log.warn(SMTP.Outgoing.class, "unable to send; error=" + e); + Log.warn(SMTP.Outgoing.class, " unable to send; error=" + e); Log.warn(SMTP.Outgoing.class, e); return false; } finally {