Merge pull request #232 from samply/develop

Release 0.9.1

Author: Threated

CHANGELOG.md

@@ -1,3 +1,11 @@
+# Samply.Beam 0.9.1 - 2025-03-21
+
+This minor release includes a bug for multiple connections from the same proxy.
+
+## Bugfixes
+
+* Fixed a bug where the broker did not notice a disconnect from the beam proxy sending the reconnected beam proxy a 409 status code causing it to crash. [#230](https://github.com/samply/beam/pull/230)
+
 # Samply.Beam 0.9.0 - 2025-03-12
 
 This major release of Beam 0.9 features a lot of internal changes and some bugfixes.

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = ["proxy", "broker", "shared", "tests", "beam-lib"]
 resolver = "2"
-package.version = "0.9.0"
+package.version = "0.9.1"
 
 [workspace.dependencies]
 beam-lib = { path = "./beam-lib", features = [ "strict-ids" ] }

broker/src/serve_health.rs

@@ -7,6 +7,7 @@ use futures_core::Stream;
 use serde::{Serialize, Deserialize};
 use shared::{crypto_jwt::Authorized, Msg, config::CONFIG_CENTRAL};
 use tokio::sync::{Mutex, OwnedMutexGuard, RwLock};
+use tracing::info;
 
 use crate::compare_client_server_version::log_version_mismatch;
 
@@ -145,7 +146,8 @@ async fn get_control_tasks(
         .clone();
     let Ok(connect_guard) = tokio::time::timeout(Duration::from_secs(60), status_mutex.lock_owned()).await
     else {
-        return Err(StatusCode::CONFLICT);
+        info!("Double connection!");
+        return Err(StatusCode::OK);
     };
 
     Ok(Sse::new(ForeverStream(connect_guard)).keep_alive(KeepAlive::new()))