send client_information to amqp-client

cloudamqp · Apr 4, 2024 · 41ec0b4 · 41ec0b4
1 parent 3bd5413
commit 41ec0b4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/lavinmq/config.cr b/src/lavinmq/config.cr
@@ -10,7 +10,7 @@ module LavinMQ
     property log_file : String? = nil
     property log_level : Log::Severity = DEFAULT_LOG_LEVEL
     property amqp_bind = "127.0.0.1"
-    property amqp_port = 5672
+    property amqp_port = 5673
     property amqps_port = -1
     property unix_path = ""
     property unix_proxy_protocol = 1_u8 # PROXY protocol version on unix domain socket connections
@@ -20,7 +20,7 @@ module LavinMQ
     property tls_ciphers = ""
     property tls_min_version = ""
     property http_bind = "127.0.0.1"
-    property http_port = 15672
+    property http_port = 15673
     property https_port = -1
     property http_unix_path = ""
     property http_systemd_socket_name = "lavinmq-http.socket"

diff --git a/src/lavinmq/federation/link.cr b/src/lavinmq/federation/link.cr
@@ -209,6 +209,11 @@ module LavinMQ
           @downstream_connection.try &.close
           upstream_uri = named_uri(@upstream.uri)
           local_uri = named_uri(@local_uri)
+          params = upstream_uri.query_params
+          pp "creating 3"
+          params["product"] = "LavinMQ"
+          params["product_version"] = LavinMQ::VERSION.to_s
+          upstream_uri.query = params.to_s
           ::AMQP::Client.start(upstream_uri) do |c|
             @upstream_connection = c
             ::AMQP::Client.start(local_uri) do |p|
@@ -301,7 +306,10 @@ module LavinMQ
         private def cleanup
           upstream_uri = @upstream.uri.dup
           params = upstream_uri.query_params
+          pp "creating 1"
           params["name"] ||= "Federation link cleanup: #{@upstream.name}/#{name}"
+          params["product"] = "LavinMQ"
+          params["product_version"] = LavinMQ::VERSION.to_s
           upstream_uri.query = params.to_s
           ::AMQP::Client.start(upstream_uri) do |c|
             ch = c.channel
@@ -353,6 +361,11 @@ module LavinMQ
           @downstream_connection.try &.close
           upstream_uri = named_uri(@upstream.uri)
           local_uri = named_uri(@local_uri)
+          params = upstream_uri.query_params
+          pp "creating 2"
+          params["product"] = "LavinMQ"
+          params["product_version"] = LavinMQ::VERSION.to_s
+          upstream_uri.query = params.to_s
           ::AMQP::Client.start(upstream_uri) do |c|
             @upstream_connection = c
             ::AMQP::Client.start(local_uri) do |p|

diff --git a/static/js/connection.js b/static/js/connection.js
@@ -31,9 +31,20 @@ function updateConnection (all) {
       const cp = item.client_properties
       document.getElementById('cp-name').textContent = cp.connection_name
       document.getElementById('cp-capabilities').textContent = DOM.jsonToText(cp.capabilities)
-      document.getElementById('cp-product').textContent = cp.product
-      document.getElementById('cp-platform').textContent = cp.platform
-      document.getElementById('cp-version').textContent = cp.version
+      if (cp.product_version) {
+        document.getElementById('cp-product').appendChild(document.createElement('span')).textContent = cp.product
+        document.getElementById('cp-product').appendChild(document.createElement('br'))
+        document.getElementById('cp-product').appendChild(document.createElement('small')).textContent = 'Verison: ' + cp.product_version
+      } else {
+        document.getElementById('cp-product').textContent = cp.product
+      }
+      if (cp.platform_version) {
+        document.getElementById('cp-platform').appendChild(document.createElement('span')).textContent = cp.platform
+        document.getElementById('cp-platform').appendChild(document.createElement('br'))
+        document.getElementById('cp-platform').appendChild(document.createElement('small')).textContent = 'Verison: ' + cp.platform_version
+      } else {
+        document.getElementById('cp-platform').textContent = cp.platform
+      }
       const infoEl = document.getElementById('cp-information')
       if (cp.information && cp.information.startsWith('http')) {
         const infoLink = document.createElement('a')

diff --git a/views/connection.ecr b/views/connection.ecr
@@ -60,10 +60,6 @@
             <th>Platform</th>
             <td id="cp-platform"></td>
           </tr>
-          <tr>
-            <th>Version</th>
-            <td id="cp-version"></td>
-          </tr>
           <tr>
             <th>Information</th>
             <td id="cp-information"></td>