diff --git a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs
index b5ed3cc1ad..9103b2cab6 100644
--- a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs
+++ b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs
@@ -89,10 +89,17 @@ impl TwitchPubsubUserSubscriberThread {
= LeasePayload::from_thread_id(&self.server_hostname, &self.thread_id);
loop {
- // TODO: Error handling
info!("Connecting to Twitch PubSub for user {}...", &record.twitch_username);
- let mut twitch_websocket_client =
- self.create_subscribed_twitch_client(&record.access_token).await.unwrap();
+ let maybe_client =
+ self.create_subscribed_twitch_client(&record.access_token).await;
+
+ let twitch_websocket_client = match maybe_client {
+ Ok(client) => client,
+ Err(e) => {
+ error!("Error building Twitch client (exiting thread): {:?}", e);
+ return;
+ }
+ };
let thread = TwitchPubsubUserSubscriberThreadStageTwo {
thread_id: self.thread_id.clone(),
@@ -165,6 +172,8 @@ struct TwitchPubsubUserSubscriberThreadStageTwo {
// ========== Stage Two Thread State ==========
twitch_websocket_client: TwitchWebsocketClient,
+
+ // We'll use this again and again, so precompute it.
expected_lease_payload: LeasePayload,
// The user's oauth access and refresh tokens.
@@ -208,10 +217,10 @@ impl TwitchPubsubUserSubscriberThreadStageTwo {
return Ok(LoopEndedReason::ExitThread { reason: "Thread lease taken".to_string() });
}
- self.maybe_renew_redis_lease().unwrap();
- self.maybe_send_twitch_ping().await.unwrap();
+ self.maybe_renew_redis_lease()?;
+ self.maybe_send_twitch_ping().await?;
- let is_active = self.maybe_check_obs_session_active().unwrap();
+ let is_active = self.maybe_check_obs_session_active()?;
if !is_active {
return Ok(LoopEndedReason::ExitThread { reason: "OBS session ended".to_string() });
}
@@ -244,13 +253,14 @@ impl TwitchPubsubUserSubscriberThreadStageTwo {
maybe_event: AnyhowResult