cleanup worker task logging

In order to avoid name conflicts with WorkerTaskContext

- renamed WorkerTask::log to WorkerTask::log_message

Note: Methods have different fuction signatures

Also renamed WorkerTask::warn to WorkerTask::log_warning for
consistency reasons.

Use the task_log!() and task_warn!() macros more often.

src/api2/node/disks/directory.rs

@@ -10,6 +10,7 @@ use pbs_api_types::{
     DataStoreConfig, NODE_SCHEMA, BLOCKDEVICE_NAME_SCHEMA,
     DATASTORE_SCHEMA, UPID_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY,
 };
+use pbs_tools::task_log;
 
 use crate::tools::disks::{
     DiskManage, FileSystemType, DiskUsageType,
@@ -169,7 +170,7 @@ pub fn create_datastore_disk(
     let upid_str = WorkerTask::new_thread(
         "dircreate", Some(name.clone()), auth_id, to_stdout, move |worker|
         {
-            worker.log(format!("create datastore '{}' on disk {}", name, disk));
+            task_log!(worker, "create datastore '{}' on disk {}", name, disk);
 
             let add_datastore = add_datastore.unwrap_or(false);
             let filesystem = filesystem.unwrap_or(FileSystemType::Ext4);

src/api2/node/disks/mod.rs

@@ -16,6 +16,7 @@ use crate::tools::disks::{
     get_disks, get_smart_data, get_disk_usage_info, inititialize_gpt_disk,
 };
 use proxmox_rest_server::WorkerTask;
+use pbs_tools::task_log;
 
 pub mod directory;
 pub mod zfs;
@@ -155,7 +156,7 @@ pub fn initialize_disk(
     let upid_str = WorkerTask::new_thread(
         "diskinit", Some(disk.clone()), auth_id, to_stdout, move |worker|
         {
-            worker.log(format!("initialize disk {}", disk));
+            task_log!(worker, "initialize disk {}", disk);
 
             let disk_manager = DiskManage::new();
             let disk_info = disk_manager.disk_by_name(&disk)?;

src/api2/node/disks/zfs.rs

@@ -13,6 +13,7 @@ use pbs_api_types::{
     DISK_LIST_SCHEMA, ZFS_ASHIFT_SCHEMA, UPID_SCHEMA,
     PRIV_SYS_AUDIT, PRIV_SYS_MODIFY,
 };
+use pbs_tools::task_log;
 
 use crate::tools::disks::{
     zpool_list, zpool_status, parse_zpool_status_config_tree, vdev_list_to_tree,
@@ -231,7 +232,7 @@ pub fn create_zpool(
      let upid_str = WorkerTask::new_thread(
         "zfscreate", Some(name.clone()), auth_id, to_stdout, move |worker|
         {
-            worker.log(format!("create {:?} zpool '{}' on devices '{}'", raidlevel, name, devices_text));
+            task_log!(worker, "create {:?} zpool '{}' on devices '{}'", raidlevel, name, devices_text);
 
 
             let mut command = std::process::Command::new("zpool");
@@ -265,10 +266,10 @@ pub fn create_zpool(
                 }
             }
 
-            worker.log(format!("# {:?}", command));
+            task_log!(worker, "# {:?}", command);
 
             let output = pbs_tools::run_command(command, None)?;
-            worker.log(output);
+            task_log!(worker, "{}", output);
 
             if std::path::Path::new("/lib/systemd/system/zfs-import@.service").exists() {
                 let import_unit = format!("zfs-import@{}.service", proxmox::tools::systemd::escape_unit(&name, false));
@@ -278,9 +279,9 @@ pub fn create_zpool(
             if let Some(compression) = compression {
                 let mut command = std::process::Command::new("zfs");
                 command.args(&["set", &format!("compression={}", compression), &name]);
-                worker.log(format!("# {:?}", command));
+                task_log!(worker, "# {:?}", command);
                 let output = pbs_tools::run_command(command, None)?;
-                worker.log(output);
+                task_log!(worker, "{}", output);
             }
 
             if add_datastore {