Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
From: ppatierno <git@git.apache.org>
To: dev@activemq.apache.org
Reply-To: dev@activemq.apache.org
References: <git-pr-1592-activemq-artemis@git.apache.org>
In-Reply-To: <git-pr-1592-activemq-artemis@git.apache.org>
Subject: [GitHub] activemq-artemis pull request #1592: NO-JIRA improve MQTT protocol logging
Content-Type: text/plain
Message-Id: <20171017192756.68DBEDFC49@git1-us-west.apache.org>
Date: Tue, 17 Oct 2017 19:27:56 +0000 (UTC)
archived-at: Tue, 17 Oct 2017 19:27:58 -0000

Github user ppatierno commented on a diff in the pull request:

    https://github.com/apache/activemq-artemis/pull/1592#discussion_r145231002
  
    --- Diff: artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTUtil.java ---
    @@ -149,16 +154,52 @@ public static void logMessage(MQTTSessionState state, MqttMessage message, boole
              if (message.fixedHeader() != null) {
                 log.append(message.fixedHeader().messageType().toString());
     
    -            if (message.variableHeader() instanceof MqttPublishVariableHeader) {
    -               log.append("(" + ((MqttPublishVariableHeader) message.variableHeader()).messageId() + ") " + message.fixedHeader().qosLevel());
    -            } else if (message.variableHeader() instanceof MqttMessageIdVariableHeader) {
    +            if (message.variableHeader() instanceof MqttMessageIdVariableHeader) {
                    log.append("(" + ((MqttMessageIdVariableHeader) message.variableHeader()).messageId() + ")");
                 }
     
    -            if (message.fixedHeader().messageType() == MqttMessageType.SUBSCRIBE) {
    -               for (MqttTopicSubscription sub : ((MqttSubscribeMessage) message).payload().topicSubscriptions()) {
    -                  log.append("\n\t" + sub.topicName() + " : " + sub.qualityOfService());
    -               }
    +            switch (message.fixedHeader().messageType()) {
    +               case PUBLISH:
    +                  MqttPublishVariableHeader publishHeader = (MqttPublishVariableHeader) message.variableHeader();
    +                  log.append("(" + publishHeader.packetId() + ")")
    +                     .append(" topic=" + publishHeader.topicName())
    +                     .append(", qos=" + message.fixedHeader().qosLevel())
    +                     .append(", retain=" + message.fixedHeader().isRetain())
    +                     .append(", dup=" + message.fixedHeader().isDup());
    +                     //.append(" payload=" + ((MqttPublishMessage)message).payload().toString(StandardCharsets.UTF_8));
    +                  break;
    +               case CONNECT:
    +                  MqttConnectVariableHeader connectHeader = (MqttConnectVariableHeader) message.variableHeader();
    +                  MqttConnectPayload payload = ((MqttConnectMessage)message).payload();
    +                  log.append(" name=").append(connectHeader.name())
    +                     .append(", version=").append(connectHeader.version())
    +                     .append(", hasUserName=").append(connectHeader.hasUserName())
    +                     .append(", hasPassword=").append(connectHeader.hasPassword())
    +                     .append(", isWillRetain=").append(connectHeader.isWillRetain())
    +                     .append(", isWillFlag=").append(connectHeader.isWillFlag())
    +                     .append(", isCleanSession=").append(connectHeader.isCleanSession())
    +                     .append(", keepAliveTimeSeconds=").append(connectHeader.keepAliveTimeSeconds())
    +                     .append(", clientIdentifier=").append(payload.clientIdentifier())
    +                     .append(", willTopic=").append(payload.willTopic())
    +                     .append(", willMessage=").append(payload.willMessage())
    +                     .append(", userName=").append(payload.userName());
    +                     //.append(", password=").append(payload.password());
    +                  break;
    +               case SUBSCRIBE:
    +                  for (MqttTopicSubscription sub : ((MqttSubscribeMessage) message).payload().topicSubscriptions()) {
    +                     log.append("\n\t" + sub.topicName() + " : " + sub.qualityOfService());
    +                  }
    +                  break;
    +               case SUBACK:
    +                  for (Integer qos : ((MqttSubAckMessage) message).payload().grantedQoSLevels()) {
    +                     log.append("\n\t" + qos);
    --- End diff --
    
    Ditto as above


---