Fix cookie directory

vercel · Mar 8, 2024 · 4751f17 · 4751f17
1 parent cd5d240
commit 4751f17
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/crates/turborepo-filewatch/src/cookies.rs b/crates/turborepo-filewatch/src/cookies.rs
@@ -183,6 +183,7 @@ fn serial_for_path(root: &AbsoluteSystemPath, path: &AbsoluteSystemPath) -> Opti
 }
 
 impl CookieWriter {
+    #[cfg(test)]
     pub fn new_with_default_cookie_dir(
         repo_root: &AbsoluteSystemPath,
         timeout: Duration,
@@ -192,6 +193,11 @@ impl CookieWriter {
         Self::new(&cookie_root, timeout, recv)
     }
 
+    #[cfg(test)]
+    pub(crate) fn cookie_dir(&self) -> &AbsoluteSystemPath {
+        &self.cookie_root
+    }
+
     pub fn new(
         cookie_root: &AbsoluteSystemPath,
         timeout: Duration,

diff --git a/crates/turborepo-filewatch/src/package_watcher.rs b/crates/turborepo-filewatch/src/package_watcher.rs
@@ -1,7 +1,7 @@
 //! This module hosts the `PackageWatcher` type, which is used to watch the
 //! filesystem for changes to packages.
 
-use std::{collections::HashMap, sync::Arc, time::Duration};
+use std::{collections::HashMap, sync::Arc};
 
 use notify::Event;
 use tokio::{
@@ -113,9 +113,10 @@ impl PackageWatcher {
         root: AbsoluteSystemPathBuf,
         recv: OptionalWatch<broadcast::Receiver<Result<Event, NotifyError>>>,
         backup_discovery: T,
+        cookie_writer: CookieWriter,
     ) -> Result<Self, package_manager::Error> {
         let (exit_tx, exit_rx) = oneshot::channel();
-        let subscriber = Subscriber::new(root, recv, backup_discovery)?;
+        let subscriber = Subscriber::new(root, recv, backup_discovery, cookie_writer)?;
         let package_manager_lazy = subscriber.manager_receiver();
         let package_data = subscriber.package_data();
         let handle = tokio::spawn(subscriber.watch(exit_rx));
@@ -217,8 +218,8 @@ impl<T: PackageDiscovery + Send + Sync + 'static> Subscriber<T> {
         repo_root: AbsoluteSystemPathBuf,
         mut recv: OptionalWatch<broadcast::Receiver<Result<Event, NotifyError>>>,
         backup_discovery: T,
+        writer: CookieWriter,
     ) -> Result<Self, Error> {
-        let writer = CookieWriter::new(&repo_root, Duration::from_secs(1), recv.clone());
         let (package_data_tx, cookie_tx, package_data_lazy) = CookiedOptionalWatch::new(writer);
         let package_data_tx = Arc::new(package_data_tx);
         let (package_manager_tx, package_manager_lazy) = package_data_lazy.new_sibling();
@@ -680,7 +681,10 @@ impl<T: PackageDiscovery + Send + Sync + 'static> Subscriber<T> {
 
 #[cfg(test)]
 mod test {
-    use std::sync::{Arc, Mutex};
+    use std::{
+        sync::{Arc, Mutex},
+        time::Duration,
+    };
 
     use itertools::Itertools;
     use tokio::{join, sync::broadcast};
@@ -691,7 +695,7 @@ mod test {
     };
 
     use super::Subscriber;
-    use crate::OptionalWatch;
+    use crate::{cookies::CookieWriter, OptionalWatch};
 
     #[derive(Debug)]
     struct MockDiscovery {
@@ -758,8 +762,11 @@ mod test {
             manager,
             package_data: Arc::new(Mutex::new(package_data)),
         };
+        let cookie_writer =
+            CookieWriter::new_with_default_cookie_dir(&root, Duration::from_secs(2), rx.clone());
 
-        let subscriber = Subscriber::new(root.clone(), rx, mock_discovery).unwrap();
+        let subscriber =
+            Subscriber::new(root.clone(), rx, mock_discovery, cookie_writer.clone()).unwrap();
 
         let mut package_data = subscriber.package_data();
 
@@ -778,7 +785,7 @@ mod test {
                     // simulate fs round trip
                     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-                    let path = root.join_component("1.cookie").as_std_path().to_owned();
+                    let path = cookie_writer.cookie_dir().join_component("1.cookie").as_std_path().to_owned();
                     tracing::info!("writing cookie at {}", path.to_string_lossy());
                     tx.send(Ok(notify::Event {
                         kind: notify::EventKind::Create(notify::event::CreateKind::File),
@@ -838,7 +845,7 @@ mod test {
                     // simulate fs round trip
                     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-                    let path = root.join_component("2.cookie").as_std_path().to_owned();
+                    let path = cookie_writer.cookie_dir().join_component("2.cookie").as_std_path().to_owned();
                     tracing::info!("writing cookie at {}", path.to_string_lossy());
                     tx.send(Ok(notify::Event {
                         kind: notify::EventKind::Create(notify::event::CreateKind::File),
@@ -913,7 +920,10 @@ mod test {
             package_data: package_data_raw.clone(),
         };
 
-        let subscriber = Subscriber::new(root.clone(), rx, mock_discovery).unwrap();
+        let cookie_writer =
+            CookieWriter::new_with_default_cookie_dir(&root, Duration::from_secs(2), rx.clone());
+        let subscriber =
+            Subscriber::new(root.clone(), rx, mock_discovery, cookie_writer.clone()).unwrap();
 
         let mut package_data = subscriber.package_data();
 
@@ -925,7 +935,7 @@ mod test {
                     // simulate fs round trip
                     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-                    let path = root.join_component("1.cookie").as_std_path().to_owned();
+                    let path = cookie_writer.cookie_dir().join_component("1.cookie").as_std_path().to_owned();
                     tracing::info!("writing cookie at {}", path.to_string_lossy());
                     tx.send(Ok(notify::Event {
                         kind: notify::EventKind::Create(notify::event::CreateKind::File),
@@ -998,7 +1008,7 @@ mod test {
                     // simulate fs round trip
                     tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-                    let path = root.join_component("2.cookie").as_std_path().to_owned();
+                    let path = cookie_writer.cookie_dir().join_component("2.cookie").as_std_path().to_owned();
                     tracing::info!("writing cookie at {}", path.to_string_lossy());
                     tx.send(Ok(notify::Event {
                         kind: notify::EventKind::Create(notify::event::CreateKind::File),

diff --git a/crates/turborepo-lib/src/daemon/server.rs b/crates/turborepo-lib/src/daemon/server.rs
@@ -102,19 +102,24 @@ impl FileWatching {
         let watcher = Arc::new(FileSystemWatcher::new_with_default_cookie_dir(&repo_root)?);
         let recv = watcher.watch();
 
-        let cookie_watcher = CookieWriter::new(
+        let cookie_writer = CookieWriter::new(
             watcher.cookie_dir(),
             Duration::from_millis(100),
             recv.clone(),
         );
         let glob_watcher = Arc::new(GlobWatcher::new(
             repo_root.clone(),
-            cookie_watcher,
+            cookie_writer.clone(),
             recv.clone(),
         ));
         let package_watcher = Arc::new(
-            PackageWatcher::new(repo_root.clone(), recv.clone(), backup_discovery)
-                .map_err(|e| WatchError::Setup(format!("{:?}", e)))?,
+            PackageWatcher::new(
+                repo_root.clone(),
+                recv.clone(),
+                backup_discovery,
+                cookie_writer,
+            )
+            .map_err(|e| WatchError::Setup(format!("{:?}", e)))?,
         );
 
         Ok(FileWatching {