diff --git a/pbs-datastore/src/catalog.rs b/pbs-datastore/src/catalog.rs index c07b71a6..f1224041 100644 --- a/pbs-datastore/src/catalog.rs +++ b/pbs-datastore/src/catalog.rs @@ -636,7 +636,7 @@ impl CatalogReader { match etype { CatalogEntryType::Directory => { - println!("{} {:?}", etype, path); + log::info!("{} {:?}", etype, path); if offset > start { bail!("got wrong directory offset ({} > {})", offset, start); } @@ -649,10 +649,10 @@ impl CatalogReader { mtime_string = s; } - println!("{} {:?} {} {}", etype, path, size, mtime_string,); + log::info!("{} {:?} {} {}", etype, path, size, mtime_string,); } _ => { - println!("{} {:?}", etype, path); + log::info!("{} {:?}", etype, path); } } diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 3cd1d98f..1ae5bcb6 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -233,7 +233,7 @@ impl DataStore { match serde_json::from_str(&state) { Ok(state) => state, Err(err) => { - eprintln!("error reading gc-status: {}", err); + log::error!("error reading gc-status: {}", err); GarbageCollectionStatus::default() } } diff --git a/pbs-datastore/src/dynamic_index.rs b/pbs-datastore/src/dynamic_index.rs index fdfcecb3..6c2ee685 100644 --- a/pbs-datastore/src/dynamic_index.rs +++ b/pbs-datastore/src/dynamic_index.rs @@ -465,7 +465,7 @@ impl DynamicChunkWriter { self.stat.disk_size += compressed_size; } - println!( + log::info!( "ADD CHUNK {:016x} {} {}% {} {}", self.chunk_offset, chunk_size, diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs index 5fc3d2ab..936bd2e7 100644 --- a/pbs-datastore/src/fixed_index.rs +++ b/pbs-datastore/src/fixed_index.rs @@ -51,7 +51,7 @@ unsafe impl Sync for FixedIndexReader {} impl Drop for FixedIndexReader { fn drop(&mut self) { if let Err(err) = self.unmap() { - eprintln!("Unable to unmap file - {}", err); + log::error!("Unable to unmap file - {}", err); } } } @@ -144,16 +144,16 @@ impl FixedIndexReader { } pub fn print_info(&self) { - println!("Size: {}", self.size); - println!("ChunkSize: {}", self.chunk_size); + log::info!("Size: {}", self.size); + log::info!("ChunkSize: {}", self.chunk_size); let mut ctime_str = self.ctime.to_string(); if let Ok(s) = proxmox_time::strftime_local("%c", self.ctime) { ctime_str = s; } - println!("CTime: {}", ctime_str); - println!("UUID: {:?}", self.uuid); + log::info!("CTime: {}", ctime_str); + log::info!("UUID: {:?}", self.uuid); } } @@ -247,7 +247,7 @@ impl Drop for FixedIndexWriter { fn drop(&mut self) { let _ = std::fs::remove_file(&self.tmp_filename); // ignore errors if let Err(err) = self.unmap() { - eprintln!("Unable to unmap file {:?} - {}", self.tmp_filename, err); + log::error!("Unable to unmap file {:?} - {}", self.tmp_filename, err); } } } @@ -418,7 +418,7 @@ impl FixedIndexWriter { let digest = &chunk_info.digest; - println!( + log::info!( "ADD CHUNK {} {} {}% {} {}", idx, chunk_len, diff --git a/pbs-datastore/src/paperkey.rs b/pbs-datastore/src/paperkey.rs index 8caca0b9..27ef1028 100644 --- a/pbs-datastore/src/paperkey.rs +++ b/pbs-datastore/src/paperkey.rs @@ -63,7 +63,7 @@ pub fn generate_paper_key( (lines, false) } Err(err) => { - eprintln!("Couldn't parse data as KeyConfig - {}", err); + log::error!("Couldn't parse data as KeyConfig - {}", err); bail!("Neither a PEM-formatted private key, nor a PBS key file."); } }