thread refactor

crates/service/twitch_pubsub_subscriber/src/main.rs

@@ -18,7 +18,7 @@ pub mod util;
 
 use config::shared_constants::{DEFAULT_RUST_LOG, DEFAULT_REDIS_DATABASE_1_CONNECTION_STRING, DEFAULT_MYSQL_CONNECTION_STRING};
 use container_common::anyhow_result::AnyhowResult;
-use crate::threads::listen_for_active_obs_sessions_thread::ListenForActiveObsSessionThread;
+use crate::threads::listen_for_active_obs_sessions::listen_for_active_obs_sessions_thread::ListenForActiveObsSessionThread;
 use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher;
 use crate::twitch::websocket_client::TwitchWebsocketClient;
 use futures::executor::{ThreadPool, ThreadPoolBuilder};

crates/service/twitch_pubsub_subscriber/src/threads/listen_for_active_obs_sessions/listen_for_active_obs_sessions_thread.rs

@@ -1,5 +1,5 @@
 use container_common::thread::thread_id::ThreadId;
-use crate::threads::twitch_pubsub_user_subscriber_thread::TwitchPubsubUserSubscriberThread;
+use crate::threads::twitch_pubsub_user_subscriber::twitch_pubsub_user_subscriber_thread::TwitchPubsubUserSubscriberThread;
 use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher;
 use log::error;
 use log::info;

crates/service/twitch_pubsub_subscriber/src/threads/listen_for_active_obs_sessions/mod.rs

@@ -0,0 +1 @@
+pub mod listen_for_active_obs_sessions_thread;

crates/service/twitch_pubsub_subscriber/src/threads/mod.rs

@@ -1,3 +1,2 @@
-pub mod listen_for_active_obs_sessions_thread;
-pub mod thread_state;
-pub mod twitch_pubsub_user_subscriber_thread;
+pub mod listen_for_active_obs_sessions;
+pub mod twitch_pubsub_user_subscriber;

crates/service/twitch_pubsub_subscriber/src/threads/thread_state/mod.rs

@@ -1 +0,0 @@
-pub mod twitch_pubsub_subscriber_state;

crates/service/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/mod.rs

@@ -0,0 +1,2 @@
+pub mod subscriber_preferences_cache;
+pub mod twitch_pubsub_user_subscriber_thread;

crates/service/twitch_pubsub_subscriber/src/threads/twitch_pubsub_user_subscriber/twitch_pubsub_user_subscriber_thread.rs

@@ -1,7 +1,8 @@
 use anyhow::{anyhow, Error};
 use container_common::anyhow_result::AnyhowResult;
 use container_common::thread::thread_id::ThreadId;
-use crate::threads::thread_state::twitch_pubsub_subscriber_state::{TwitchEventRuleLight, TwitchPubsubCachedState};
+use crate::threads::twitch_pubsub_user_subscriber::subscriber_preferences_cache::TwitchEventRuleLight;
+use crate::threads::twitch_pubsub_user_subscriber::subscriber_preferences_cache::TwitchPubsubCachedState;
 use crate::twitch::constants::TWITCH_PING_CADENCE;
 use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher;
 use crate::twitch::pubsub::build_pubsub_topics_for_user::build_pubsub_topics_for_user;