From b0fe6c726ede684efb568bbeeea44b08b9766868 Mon Sep 17 00:00:00 2001
From: Nathan Flurry <git@nathanflurry.com>
Date: Sat, 2 May 2026 17:22:24 -0700
Subject: [PATCH] fix(serverless): suppress cancelled start errors

---
 rivetkit-rust/packages/rivetkit-core/src/serverless.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rivetkit-rust/packages/rivetkit-core/src/serverless.rs b/rivetkit-rust/packages/rivetkit-core/src/serverless.rs
index 20f5f6ef1c..aa846663f8 100644
--- a/rivetkit-rust/packages/rivetkit-core/src/serverless.rs
+++ b/rivetkit-rust/packages/rivetkit-core/src/serverless.rs
@@ -283,6 +283,7 @@ impl CoreServerlessRuntime {
 		RuntimeSpawner::spawn(async move {
 			let shutdown_handle = handle.clone();
 			let result = tokio::select! {
+				biased;
 				_ = cancel_token.cancelled() => {
 					if !cache_envoy {
 						shutdown_handle.shutdown_and_wait(false).await;
@@ -292,6 +293,7 @@ impl CoreServerlessRuntime {
 				result = handle.start_serverless_actor(&payload) => result,
 			};
 			if let Err(error) = result {
+				tracing::error!(?error, "serverless start failed");
 				let error = stream_error(error);
 				let _ = tx.send(Err(error)).await;
 				if !cache_envoy {