From 94ee1091a2b6de5714071cca75877dd64a1f66f6 Mon Sep 17 00:00:00 2001 From: mguessan Date: Tue, 22 Sep 2009 09:03:32 +0000 Subject: [PATCH] IMAP: improve error logging on network down git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@738 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/exchange/ExchangeSessionFactory.java | 2 +- src/java/davmail/exchange/NetworkDownException.java | 9 +++++++++ src/java/davmail/imap/ImapConnection.java | 2 +- src/java/davmailmessages.properties | 2 +- src/java/davmailmessages_fr.properties | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/java/davmail/exchange/ExchangeSessionFactory.java b/src/java/davmail/exchange/ExchangeSessionFactory.java index 15f7eff9..18e4358c 100644 --- a/src/java/davmail/exchange/ExchangeSessionFactory.java +++ b/src/java/davmail/exchange/ExchangeSessionFactory.java @@ -163,7 +163,7 @@ public final class ExchangeSessionFactory { BundleMessage message = new BundleMessage("EXCEPTION_CONNECT", exc.getClass().getName(), exc.getMessage()); if (errorSent) { ExchangeSession.LOGGER.warn(message); - throw new NetworkDownException("EXCEPTION_DAVMAIL_CONFIGURATION"); + throw new NetworkDownException("EXCEPTION_DAVMAIL_CONFIGURATION", message); } else { // Mark that an error has been sent so you only get one // error in a row (not a repeating string of errors). diff --git a/src/java/davmail/exchange/NetworkDownException.java b/src/java/davmail/exchange/NetworkDownException.java index b92d390f..7cc24864 100644 --- a/src/java/davmail/exchange/NetworkDownException.java +++ b/src/java/davmail/exchange/NetworkDownException.java @@ -31,4 +31,13 @@ public class NetworkDownException extends DavMailException { public NetworkDownException(String key) { super(key); } + + /** + * Build a network down exception with the provided BundleMessage key. + * @param key message key + * @param message detailed message + */ + public NetworkDownException(String key, Object message) { + super(key, message); + } } diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java index 668b694a..c6f5163d 100644 --- a/src/java/davmail/imap/ImapConnection.java +++ b/src/java/davmail/imap/ImapConnection.java @@ -470,7 +470,7 @@ public class ImapConnection extends AbstractConnection { } catch (Exception e) { DavGatewayTray.log(e); try { - String message = (e.getMessage() == null) ? e.toString() : e.getMessage(); + String message = ((e.getMessage() == null) ? e.toString() : e.getMessage()).replaceAll("\\n", " "); if (commandId != null) { sendClient(commandId + " BAD unable to handle request: " + message); } else { diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties index bc894137..0d00524b 100644 --- a/src/java/davmailmessages.properties +++ b/src/java/davmailmessages.properties @@ -3,7 +3,7 @@ EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Authentication failed: password EXCEPTION_AUTHENTICATION_FAILED_RETRY=Authentication failed: invalid user or password, retry with domain\\user EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Authentication form not found at {0} EXCEPTION_CONNECTION_FAILED=Unable to connect to OWA at {0}, status code {1}, check configuration -EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception: \n{0} +EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception:\n{0} EXCEPTION_END_OF_STREAM=End of stream reached reading content EXCEPTION_EVENT_NOT_FOUND=Calendar event not found EXCEPTION_EXCHANGE_LOGIN_FAILED=Exchange login exception: {0} diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties index 2815fbf1..49743a20 100644 --- a/src/java/davmailmessages_fr.properties +++ b/src/java/davmailmessages_fr.properties @@ -3,7 +3,7 @@ EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Echec d''authentification : mot EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur EXCEPTION_AUTHENTICATION_FORM_NOT_FOUND=Formulaire d''authentification non trouvé à l''adresse {0} EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration -EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail : \n{0} +EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail :\n{0} EXCEPTION_END_OF_STREAM=Fin de flux âtteint pendant la lecture du contenu EXCEPTION_EVENT_NOT_FOUND=Evènement non trouvé EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0}