You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/12/18 09:10:28 UTC
[1/2] james-project git commit: JAMES-2625 Fix SMTPSessionImpl netty
error from error to info
Repository: james-project
Updated Branches:
refs/heads/master db1c5dac5 -> c9a2ebfb5
JAMES-2625 Fix SMTPSessionImpl netty error from error to info
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c9a2ebfb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c9a2ebfb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c9a2ebfb
Branch: refs/heads/master
Commit: c9a2ebfb5f55439e963a56ded6703a4fceb4e6f5
Parents: d7f060d
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Tue Dec 11 14:32:32 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Tue Dec 18 10:10:13 2018 +0100
----------------------------------------------------------------------
.../james/protocols/netty/BasicChannelUpstreamHandler.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c9a2ebfb/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
index 9454428..3b0586a 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
@@ -19,6 +19,7 @@
package org.apache.james.protocols.netty;
import java.io.Closeable;
+import java.nio.channels.ClosedChannelException;
import java.util.LinkedList;
import java.util.List;
@@ -234,7 +235,11 @@ public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
}
transport.writeResponse(Response.DISCONNECT, session);
}
- LOGGER.error("Unable to process request", e.getCause());
+ if (e.getCause() instanceof ClosedChannelException) {
+ LOGGER.info("Unable to process request", e.getCause());
+ } else {
+ LOGGER.error("Unable to process request", e.getCause());
+ }
cleanup(ctx);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-2625 Fix JMAPServlet jetty
error from warning to info
Posted by ro...@apache.org.
JAMES-2625 Fix JMAPServlet jetty error from warning to info
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d7f060d9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d7f060d9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d7f060d9
Branch: refs/heads/master
Commit: d7f060d9d0dace02622594a46d39d9bcc4fad20f
Parents: db1c5da
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Tue Dec 11 14:25:38 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Tue Dec 18 10:10:13 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/james/jmap/JMAPServlet.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d7f060d9/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
index c519a88..970a358 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPServlet.java
@@ -21,6 +21,7 @@ package org.apache.james.jmap;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import java.io.IOException;
+import java.nio.channels.ClosedChannelException;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -78,9 +79,9 @@ public class JMAPServlet extends HttpServlet {
.collect(Collectors.toList());
resp.setContentType(JSON_CONTENT_TYPE);
- objectMapper.writeValue(resp.getOutputStream(), responses);
+ sendResponses(resp, responses);
} catch (IOException e) {
- LOGGER.warn("error handling request", e);
+ LOGGER.warn("Error handling request", e);
resp.setStatus(SC_BAD_REQUEST);
} catch (Exception e) {
LOGGER.error("Error handling request", e);
@@ -90,6 +91,15 @@ public class JMAPServlet extends HttpServlet {
}
}
+ private void sendResponses(HttpServletResponse response, List<Object[]> responses) throws IOException {
+ try {
+ objectMapper.writeValue(response.getOutputStream(), responses);
+ } catch (ClosedChannelException e) {
+ LOGGER.info("Error sending response", e);
+ response.setStatus(SC_BAD_REQUEST);
+ }
+ }
+
private Stream<? extends ProtocolResponse> handle(AuthenticatedProtocolRequest request) {
try {
return requestHandler.handle(request);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org