From commits-return-40600-apmail-nifi-commits-archive=nifi.apache.org@nifi.apache.org Fri Mar 1 02:31:03 2019 Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BB9E1832A for ; Fri, 1 Mar 2019 02:31:03 +0000 (UTC) Received: (qmail 83059 invoked by uid 500); 1 Mar 2019 02:31:03 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 83036 invoked by uid 500); 1 Mar 2019 02:31:03 -0000 Mailing-List: contact commits-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list commits@nifi.apache.org Received: (qmail 83027 invoked by uid 99); 1 Mar 2019 02:31:03 -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; Fri, 01 Mar 2019 02:31:03 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 97CEB82E8A; Fri, 1 Mar 2019 02:31:02 +0000 (UTC) Date: Fri, 01 Mar 2019 02:31:02 +0000 To: "commits@nifi.apache.org" Subject: [nifi-minifi-cpp] branch master updated: MINIFICPP-744: Add aliases within c2 responses MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155140746252.5279.1621959559330265972@gitbox.apache.org> From: aldrin@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: nifi-minifi-cpp X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8a4c2ac04693d56ba201adae3b5207ea96e92b50 X-Git-Newrev: 07e420cc725592ffc6a494dc0e5ef453c89d439b X-Git-Rev: 07e420cc725592ffc6a494dc0e5ef453c89d439b X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. aldrin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git The following commit(s) were added to refs/heads/master by this push: new 07e420c MINIFICPP-744: Add aliases within c2 responses 07e420c is described below commit 07e420cc725592ffc6a494dc0e5ef453c89d439b Author: Marc Parisi AuthorDate: Tue Feb 26 21:01:15 2019 -0500 MINIFICPP-744: Add aliases within c2 responses This closes #490. Signed-off-by: Aldrin Piri --- libminifi/src/c2/ControllerSocketProtocol.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libminifi/src/c2/ControllerSocketProtocol.cpp b/libminifi/src/c2/ControllerSocketProtocol.cpp index d4f3970..99f2a24 100644 --- a/libminifi/src/c2/ControllerSocketProtocol.cpp +++ b/libminifi/src/c2/ControllerSocketProtocol.cpp @@ -258,11 +258,11 @@ int16_t ControllerSocketProtocol::heartbeat(const C2Payload &payload) { if (server_socket_ == nullptr) return 0; const std::vector &content = payload.getContent(); - for (const auto pc : payload.getNestedPayloads()) { - if (pc.getLabel() == "metrics") { - for (const auto metrics_payload : pc.getNestedPayloads()) { - if (metrics_payload.getLabel() == "QueueMetrics") { - for (const auto queue_metrics : metrics_payload.getNestedPayloads()) { + for (const auto &pc : payload.getNestedPayloads()) { + if (pc.getLabel() == "flowInfo" || pc.getLabel() == "metrics") { + for (const auto &metrics_payload : pc.getNestedPayloads()) { + if (metrics_payload.getLabel() == "QueueMetrics" || metrics_payload.getLabel() == "queues") { + for (const auto &queue_metrics : metrics_payload.getNestedPayloads()) { auto metric_content = queue_metrics.getContent(); for (const auto &payload_content : queue_metrics.getContent()) { uint64_t size = 0;