diff --git a/Cargo.lock b/Cargo.lock index 55c217d82574..dbd23f150cbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3410,7 +3410,6 @@ dependencies = [ "base64", "bincode", "directories-next", - "file-per-thread-logger", "filetime", "log", "once_cell", diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml index 8bcfd5d66138..28943c078057 100644 --- a/crates/cache/Cargo.toml +++ b/crates/cache/Cargo.toml @@ -13,7 +13,6 @@ anyhow = { workspace = true } base64 = "0.21.0" bincode = "1.1.4" directories-next = "2.0" -file-per-thread-logger = { workspace = true } log = { workspace = true } serde = { version = "1.0.94", features = ["derive"] } sha2 = "0.10.2" diff --git a/crates/cache/src/config.rs b/crates/cache/src/config.rs index 1e58082edf53..5f028293aa11 100644 --- a/crates/cache/src/config.rs +++ b/crates/cache/src/config.rs @@ -366,7 +366,7 @@ impl CacheConfig { fn spawn_worker(&mut self) { if self.enabled { - self.worker = Some(Worker::start_new(self, None)); + self.worker = Some(Worker::start_new(self)); } } diff --git a/crates/cache/src/worker.rs b/crates/cache/src/worker.rs index 73c6dbf8a2a3..47b252095b51 100644 --- a/crates/cache/src/worker.rs +++ b/crates/cache/src/worker.rs @@ -53,10 +53,7 @@ enum CacheEvent { } impl Worker { - pub(super) fn start_new( - cache_config: &CacheConfig, - init_file_per_thread_logger: Option<&'static str>, - ) -> Self { + pub(super) fn start_new(cache_config: &CacheConfig) -> Self { let queue_size = match cache_config.worker_event_queue_size() { num if num <= usize::max_value() as u64 => num as usize, _ => usize::max_value(), @@ -76,7 +73,7 @@ impl Worker { // when self is dropped, sender will be dropped, what will cause the channel // to hang, and the worker thread to exit -- it happens in the tests // non-tests binary has only a static worker, so Rust doesn't drop it - thread::spawn(move || worker_thread.run(init_file_per_thread_logger)); + thread::spawn(move || worker_thread.run()); Self { sender: tx, @@ -192,11 +189,7 @@ macro_rules! unwrap_or_warn { } impl WorkerThread { - fn run(self, init_file_per_thread_logger: Option<&'static str>) { - if let Some(prefix) = init_file_per_thread_logger { - file_per_thread_logger::initialize(prefix); - } - + fn run(self) { debug!("Cache worker thread started."); Self::lower_thread_priority(); diff --git a/crates/cache/src/worker/tests.rs b/crates/cache/src/worker/tests.rs index 9c04e020e422..d2652c6c2d28 100644 --- a/crates/cache/src/worker/tests.rs +++ b/crates/cache/src/worker/tests.rs @@ -19,7 +19,7 @@ fn test_on_get_create_stats_file() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); worker.on_cache_get_async(mod_file); @@ -47,7 +47,7 @@ fn test_on_get_update_usage_counter() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let stats_file = cache_dir.join("some-mod.stats"); @@ -84,7 +84,7 @@ fn test_on_get_recompress_no_mod_file() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let stats_file = cache_dir.join("some-mod.stats"); @@ -126,7 +126,7 @@ fn test_on_get_recompress_with_mod_file() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let mod_data = "some test data to be compressed"; @@ -203,7 +203,7 @@ fn test_on_get_recompress_lock() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let mod_data = "some test data to be compressed"; @@ -271,7 +271,7 @@ fn test_on_update_fresh_stats_file() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let stats_file = cache_dir.join("some-mod.stats"); @@ -325,7 +325,7 @@ fn test_on_update_cleanup_limits_trash_locks() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let content_1k = "a".repeat(1_000); let content_10k = "a".repeat(10_000); @@ -462,7 +462,7 @@ fn test_on_update_cleanup_lru_policy() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let content_1k = "a".repeat(1_000); let content_5k = "a".repeat(5_000); let content_10k = "a".repeat(10_000); @@ -595,7 +595,7 @@ fn test_on_update_cleanup_future_files() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let content_1k = "a".repeat(1_000); let mods_files_dir = cache_dir.join("target-triple").join("compiler-version"); @@ -700,7 +700,7 @@ fn test_on_update_cleanup_self_lock() { cache_dir ); assert!(cache_config.enabled()); - let worker = Worker::start_new(&cache_config, None); + let worker = Worker::start_new(&cache_config); let mod_file = cache_dir.join("some-mod"); let trash_file = cache_dir.join("trash-file.txt");