From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup rebased 3/9] pbs-datastore: replace print with log macro
Date: Tue, 10 May 2022 09:01:52 +0000 [thread overview]
Message-ID: <20220510090158.33504-5-h.laimer@proxmox.com> (raw)
In-Reply-To: <20220510090158.33504-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-datastore/src/catalog.rs | 6 +++---
pbs-datastore/src/datastore.rs | 4 ++--
pbs-datastore/src/dynamic_index.rs | 2 +-
pbs-datastore/src/fixed_index.rs | 14 +++++++-------
pbs-datastore/src/paperkey.rs | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
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<R: Read + Seek> CatalogReader<R> {
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<R: Read + Seek> CatalogReader<R> {
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 6df23c52..af8331e3 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -220,7 +220,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()
}
}
@@ -389,7 +389,7 @@ impl DataStore {
continue;
}
}
- println!("remove unused file {:?}", item.file_name());
+ log::info!("remove unused file {:?}", item.file_name());
let dirfd = item.parent_fd();
let _res = unsafe { libc::unlinkat(dirfd, item.file_name().as_ptr(), 0) };
}
diff --git a/pbs-datastore/src/dynamic_index.rs b/pbs-datastore/src/dynamic_index.rs
index 9eb035d1..306717ac 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<W: Write>(
(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.");
}
}
--
2.30.2
next prev parent reply other threads:[~2022-05-10 9:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 9:01 [pbs-devel] [PATCH-SERIES] replace print by log macro in libraries Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 1/9] bins: init cli logger Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox 1/1] router: add init_cli_logger helper function Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 2/9] pbs-client: replace print with log macro Hannes Laimer
2022-05-31 8:38 ` Wolfgang Bumiller
2022-05-10 9:01 ` Hannes Laimer [this message]
2022-05-31 8:44 ` [pbs-devel] [PATCH proxmox-backup rebased 3/9] pbs-datastore: " Wolfgang Bumiller
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 4/9] pbs-fuse+pbs-tape: " Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 5/9] proxmox-backup-client: " Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 6/9] proxmox-file-restore: " Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 7/9] proxmox-rest-server: " Hannes Laimer
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 8/9] " Hannes Laimer
2022-05-31 8:42 ` Wolfgang Bumiller
2022-05-10 9:01 ` [pbs-devel] [PATCH proxmox-backup rebased 9/9] docs: add note for setting verbosity level Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220510090158.33504-5-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox