From commits-return-18927-archive-asf-public=cust-asf.ponee.io@pulsar.apache.org Wed Dec 12 20:15:29 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4A58F180676 for ; Wed, 12 Dec 2018 20:15:29 +0100 (CET) Received: (qmail 63732 invoked by uid 500); 12 Dec 2018 19:15:28 -0000 Mailing-List: contact commits-help@pulsar.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.apache.org Delivered-To: mailing list commits@pulsar.apache.org Received: (qmail 63723 invoked by uid 99); 12 Dec 2018 19:15:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Dec 2018 19:15:28 +0000 From: GitBox To: commits@pulsar.apache.org Subject: [GitHub] merlimat closed pull request #3172: Modify producer handler of WebSocket to send ack to client asynchronously Message-ID: <154464212789.25868.4809929864490109952.gitbox@gitbox.apache.org> Date: Wed, 12 Dec 2018 19:15:27 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit merlimat closed pull request #3172: Modify producer handler of WebSocket to send ack to client asynchronously URL: https://github.com/apache/pulsar/pull/3172 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java index bca9762c2f..338c0f1ebd 100644 --- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java +++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ProducerHandler.java @@ -52,6 +52,7 @@ import org.apache.pulsar.websocket.data.ProducerAck; import org.apache.pulsar.websocket.data.ProducerMessage; import org.apache.pulsar.websocket.stats.StatsBuckets; +import org.eclipse.jetty.websocket.api.WriteCallback; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -243,7 +244,20 @@ protected Boolean isAuthorized(String authRole, AuthenticationDataSource authent private void sendAckResponse(ProducerAck response) { try { String msg = ObjectMapperFactory.getThreadLocal().writeValueAsString(response); - getSession().getRemote().sendString(msg); + getSession().getRemote().sendString(msg, new WriteCallback() { + @Override + public void writeFailed(Throwable th) { + log.warn("[{}] Failed to send ack {}", producer.getTopic(), th.getMessage(), th); + } + + @Override + public void writeSuccess() { + if (log.isDebugEnabled()) { + log.debug("[{}] Ack was sent successfully to {}", producer.getTopic(), + getRemote().getInetSocketAddress().toString()); + } + } + }); } catch (JsonProcessingException e) { log.warn("[{}] Failed to generate ack json-response {}", producer.getTopic(), e.getMessage(), e); } catch (Exception e) { ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services