You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/12/14 13:55:11 UTC

[activemq-artemis] 02/04: ARTEMIS-3570 decode more timestamp properties

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 02e19e6531942e3217cacaa89d1de191edeb6093
Author: Erwin Dondorp <er...@cgi.com>
AuthorDate: Tue Oct 12 22:57:31 2021 +0200

    ARTEMIS-3570 decode more timestamp properties
---
 .../src/main/webapp/plugin/js/components/browse.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
index 7db201c..30dbbc2 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
@@ -817,8 +817,8 @@ var Artemis;
 
 
         var amqpEncodingLabels = [
-			"amqp-unknown", "amqp-null", "amqp-data", "amqp-sequence", "amqp-value-null",
-			"amqp-value-string", "amqp-value-binary", "amqp-value-map", "amqp-value-list"];
+            "amqp-unknown", "amqp-null", "amqp-data", "amqp-sequence", "amqp-value-null",
+            "amqp-value-string", "amqp-value-binary", "amqp-value-map", "amqp-value-list"];
         function formatAmqpEncoding(enc) {
             if (isNaN(enc)) {
                 return enc;
@@ -833,11 +833,19 @@ var Artemis;
                     Artemis.log.debug("key=" + key + " value=" + value);
                     angular.forEach(value, function (v2, k2) {
                     Artemis.log.debug("key=" + k2 + " value=" + v2);
-						if(k2 === "_AMQ_Binding_Type") {
-							v2 += " (" + formatBindingType(v2) + ")";
-						} else if(k2 === "JMS_AMQP_ORIGINAL_ENCODING") {
-							v2 += " (" + formatAmqpEncoding(v2) + ")";
-						}
+                        if(k2 === "_AMQ_Binding_Type") {
+                            v2 += " (" + formatBindingType(v2) + ")";
+                        } else if(k2 === "JMS_AMQP_ORIGINAL_ENCODING") {
+                            v2 += " (" + formatAmqpEncoding(v2) + ")";
+                        } else if(k2 === "_AMQ_NotifTimestamp") {
+                            v2 += " (" + formatTimestamp(v2) + ")";
+                        } else if(k2 === "extraProperties._AMQ_ACTUAL_EXPIRY") {
+                            v2 += " (" + formatTimestamp(v2) + ")";
+                        } else if(k2 === "messageAnnotations.x-opt-ACTUAL-EXPIRY") {
+                            v2 += " (" + formatTimestamp(v2) + ")";
+                        } else if(k2 === "properties.creationTime") {
+                            v2 += " (" + formatTimestamp(v2) + ")";
+                        }
                         properties.push({key: k2, value: v2});
                     });
                 }