[pbs-devel] [PATCH-SERIES proxmox-backup/proxmox v3 00/10] replace print by log macro in libraries

Hannes Laimer h.laimer at proxmox.com
Wed Jun 15 10:19:46 CEST 2022


This series mostly replaces print with the log macro in libs, it also replaces print
in binaries where it is used to log stuff and not output the result of a command.
In the process of replacing prints by log macros a few parameters controlling verbosity
became obsolete and were removed(outputs that were behind an if(verbose).. are now log::debug),
other 'verbose' parameters influenced the control flow and where therefore kept.

The whole changes were split up into 7 seperate patches[2-8], this was done
to aviod one huge patch file and improve readability. Those (maybe also 1) 
should be squashed when applied since they are not necesarilly buildable. 
The reason for that is that in a few places 'verbose' parameters were remove.

A verion bump is also needed since patches 1 (and indirectly 2-8) depend on 
the function added to proxmox-router.

v3, thanks @Wolfgang Bumiller <w.bumiller at proxmox.com>:
 * updated verbosity in some places
 * used log_enabled!(...)
 * removed unused 'print_info' function
 * rebased onto master

* proxmox
Hannes Laimer (1):
  router: add init_cli_logger helper function

 proxmox-router/Cargo.toml     |  1 +
 proxmox-router/src/cli/mod.rs | 11 +++++++++++
 2 files changed, 12 insertions(+)

* proxmox-backup
Hannes Laimer (10):
  bins: init cli logger
  pbs-client: replace print with log macro
  pbs-datastore: replace print with log macro
  pbs-fuse+pbs-tape: replace print with log macro
  proxmox-backup-client: replace print with log macro
  proxmox-file-restore: replace print with log macro
  proxmox-rest-server: replace print with log macro
  replace print with log macro
  docs: add note for setting verbosity level
  fixed_index: remove unused 'print_info' function

 docs/command-syntax.rst                       |   4 +
 examples/upload-speed.rs                      |   2 +-
 pbs-client/Cargo.toml                         |   1 +
 pbs-client/src/backup_writer.rs               | 103 ++++++++----------
 pbs-client/src/catalog_shell.rs               |   4 +-
 pbs-client/src/http_client.rs                 |  14 +--
 pbs-client/src/pxar/create.rs                 |   2 -
 pbs-client/src/pxar/extract.rs                |  70 ++++--------
 pbs-client/src/pxar/fuse.rs                   |  18 ++-
 pbs-client/src/pxar/metadata.rs               |   4 +-
 pbs-client/src/pxar_backup_stream.rs          |   6 +-
 pbs-client/src/task_log.rs                    |   8 +-
 pbs-client/src/tools/key_source.rs            |   2 +-
 pbs-datastore/src/catalog.rs                  |   6 +-
 pbs-datastore/src/datastore.rs                |   2 +-
 pbs-datastore/src/dynamic_index.rs            |   2 +-
 pbs-datastore/src/fixed_index.rs              |  19 +---
 pbs-datastore/src/paperkey.rs                 |   2 +-
 pbs-fuse-loop/Cargo.toml                      |   3 +-
 pbs-fuse-loop/src/fuse_loop.rs                |  12 +-
 pbs-tape/Cargo.toml                           |   1 +
 pbs-tape/src/bin/pmt.rs                       |  12 +-
 pbs-tape/src/bin/pmtx.rs                      |  10 +-
 pbs-tape/src/sg_pt_changer.rs                 |   4 +-
 proxmox-backup-client/Cargo.toml              |   1 +
 proxmox-backup-client/src/benchmark.rs        |  36 ++----
 proxmox-backup-client/src/catalog.rs          |   6 +-
 proxmox-backup-client/src/key.rs              |  27 +++--
 proxmox-backup-client/src/main.rs             |  92 +++++++---------
 proxmox-backup-client/src/mount.rs            |  12 +-
 proxmox-file-restore/Cargo.toml               |   1 +
 proxmox-file-restore/src/block_driver_qemu.rs |   6 +-
 proxmox-file-restore/src/main.rs              |  26 ++---
 proxmox-file-restore/src/qemu_helper.rs       |  18 ++-
 proxmox-rest-server/src/api_config.rs         |   4 +-
 proxmox-rest-server/src/command_socket.rs     |  13 ++-
 proxmox-rest-server/src/file_logger.rs        |   2 +-
 .../src/proxmox_restore_daemon/api.rs         |   1 -
 pxar-bin/Cargo.toml                           |   1 +
 pxar-bin/src/main.rs                          |  51 +++------
 src/api2/admin/datastore.rs                   |   6 +-
 src/bin/proxmox-backup-debug.rs               |   4 +-
 src/bin/proxmox-backup-manager.rs             |   2 +
 src/bin/proxmox-tape.rs                       |   2 +
 src/bin/sg-tape-cmd.rs                        |  12 +-
 45 files changed, 259 insertions(+), 375 deletions(-)

-- 
2.30.2






More information about the pbs-devel mailing list