Migrate db log paths

clockworklabs · Jun 13, 2024 · 41a92b8 · 41a92b8
1 parent 44832f2
commit 41a92b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/crates/client-api/src/routes/database.rs b/crates/client-api/src/routes/database.rs
@@ -435,7 +435,7 @@ where
         ))?;
     let instance_id = database_instance.id;
 
-    let filepath = DatabaseLogger::filepath(&address, instance_id);
+    let filepath = DatabaseLogger::filepath(instance_id);
     let lines = DatabaseLogger::read_latest(&filepath, num_lines).await;
 
     let body = if follow {

diff --git a/crates/core/src/database_logger.rs b/crates/core/src/database_logger.rs
@@ -1,5 +1,4 @@
 use core::str::FromStr;
-use spacetimedb_lib::address::Address;
 use std::fs::OpenOptions;
 use std::fs::{self, File};
 use std::io::{self, prelude::*, SeekFrom};
@@ -126,11 +125,9 @@ impl DatabaseLogger {
     //     PathBuf::from(path)
     // }
 
-    pub fn filepath(address: &Address, instance_id: u64) -> PathBuf {
-        let root = crate::stdb_path("worker_node/database_instances");
-        root.join(&*address.to_hex())
-            .join(instance_id.to_string())
-            .join("module_logs")
+    pub fn filepath(instance_id: u64) -> PathBuf {
+        let root = crate::stdb_path("database_instances");
+        root.join(instance_id.to_string()).join("module_logs")
     }
 
     pub fn open(root: impl AsRef<Path>) -> Self {

diff --git a/crates/core/src/host/host_controller.rs b/crates/core/src/host/host_controller.rs
@@ -547,7 +547,7 @@ async fn make_dbic(
     instance_id: u64,
     relational_db: Arc<RelationalDB>,
 ) -> anyhow::Result<DatabaseInstanceContext> {
-    let log_path = DatabaseLogger::filepath(&database.address, instance_id);
+    let log_path = DatabaseLogger::filepath(instance_id);
     let logger = tokio::task::block_in_place(|| Arc::new(DatabaseLogger::open(log_path)));
     let subscriptions = ModuleSubscriptions::new(relational_db.clone(), database.owner_identity);
 

diff --git a/crates/testing/src/modules.rs b/crates/testing/src/modules.rs
@@ -72,7 +72,7 @@ impl ModuleHandle {
     }
 
     pub async fn read_log(&self, size: Option<u32>) -> String {
-        let filepath = DatabaseLogger::filepath(&self.db_address, self.client.database_instance_id);
+        let filepath = DatabaseLogger::filepath(self.client.database_instance_id);
         DatabaseLogger::read_latest(&filepath, size).await
     }
 }