From 78fc7b0e94b5fb840432075cafcd07efd2873f81 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 28 Nov 2023 09:50:40 +0100 Subject: [PATCH] s/commando/command/ this has always bugged me Signed-off-by: Wolfgang Bumiller --- src/bin/proxmox-backup-api.rs | 10 +++++----- src/bin/proxmox-backup-manager.rs | 6 +++--- src/bin/proxmox-backup-proxy.rs | 14 +++++++------- src/bin/proxmox-daily-update.rs | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs index c6c24449..e46557a0 100644 --- a/src/bin/proxmox-backup-api.rs +++ b/src/bin/proxmox-backup-api.rs @@ -74,7 +74,7 @@ async fn run() -> Result<(), Error> { proxmox_backup::auth_helpers::setup_auth_context(true); let backup_user = pbs_config::backup_user()?; - let mut commando_sock = proxmox_rest_server::CommandSocket::new( + let mut command_sock = proxmox_rest_server::CommandSocket::new( proxmox_rest_server::our_ctrl_sock(), backup_user.gid, ); @@ -94,13 +94,13 @@ async fn run() -> Result<(), Error> { pbs_buildcfg::API_ACCESS_LOG_FN, Some(dir_opts.clone()), Some(file_opts.clone()), - &mut commando_sock, + &mut command_sock, )? .enable_auth_log( pbs_buildcfg::API_AUTH_LOG_FN, Some(dir_opts.clone()), Some(file_opts.clone()), - &mut commando_sock, + &mut command_sock, )?; let rest_server = RestServer::new(config); @@ -131,8 +131,8 @@ async fn run() -> Result<(), Error> { proxmox_rest_server::write_pid(pbs_buildcfg::PROXMOX_BACKUP_API_PID_FN)?; let init_result: Result<(), Error> = try_block!({ - proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; - commando_sock.spawn()?; + proxmox_rest_server::register_task_control_commands(&mut command_sock)?; + command_sock.spawn()?; proxmox_rest_server::catch_shutdown_signal()?; proxmox_rest_server::catch_reload_signal()?; Ok(()) diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index eadfe547..115207f3 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -488,12 +488,12 @@ async fn run() -> Result<(), Error> { file_opts, )?; - let mut commando_sock = proxmox_rest_server::CommandSocket::new( + let mut command_sock = proxmox_rest_server::CommandSocket::new( proxmox_rest_server::our_ctrl_sock(), backup_user.gid, ); - proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; - commando_sock.spawn()?; + proxmox_rest_server::register_task_control_commands(&mut command_sock)?; + command_sock.spawn()?; } let mut rpcenv = CliEnvironment::new(); diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 16520bd9..9c49026b 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -226,7 +226,7 @@ async fn run() -> Result<(), Error> { ]); let backup_user = pbs_config::backup_user()?; - let mut commando_sock = proxmox_rest_server::CommandSocket::new( + let mut command_sock = proxmox_rest_server::CommandSocket::new( proxmox_rest_server::our_ctrl_sock(), backup_user.gid, ); @@ -243,13 +243,13 @@ async fn run() -> Result<(), Error> { pbs_buildcfg::API_ACCESS_LOG_FN, Some(dir_opts.clone()), Some(file_opts.clone()), - &mut commando_sock, + &mut command_sock, )? .enable_auth_log( pbs_buildcfg::API_AUTH_LOG_FN, Some(dir_opts.clone()), Some(file_opts.clone()), - &mut commando_sock, + &mut command_sock, )?; let rest_server = RestServer::new(config); @@ -266,7 +266,7 @@ async fn run() -> Result<(), Error> { let acceptor = Arc::new(Mutex::new(acceptor)); // to renew the acceptor we just add a command-socket handler - commando_sock.register_command("reload-certificate".to_string(), { + command_sock.register_command("reload-certificate".to_string(), { let acceptor = Arc::clone(&acceptor); move |_value| -> Result<_, Error> { log::info!("reloading certificate"); @@ -282,7 +282,7 @@ async fn run() -> Result<(), Error> { })?; // to remove references for not configured datastores - commando_sock.register_command("datastore-removed".to_string(), |_value| { + command_sock.register_command("datastore-removed".to_string(), |_value| { if let Err(err) = DataStore::remove_unused_datastores() { log::error!("could not refresh datastores: {err}"); } @@ -338,8 +338,8 @@ async fn run() -> Result<(), Error> { proxmox_rest_server::write_pid(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)?; let init_result: Result<(), Error> = try_block!({ - proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; - commando_sock.spawn()?; + proxmox_rest_server::register_task_control_commands(&mut command_sock)?; + command_sock.spawn()?; proxmox_rest_server::catch_shutdown_signal()?; proxmox_rest_server::catch_reload_signal()?; Ok(()) diff --git a/src/bin/proxmox-daily-update.rs b/src/bin/proxmox-daily-update.rs index 2b5f7a98..ae3744c5 100644 --- a/src/bin/proxmox-daily-update.rs +++ b/src/bin/proxmox-daily-update.rs @@ -100,12 +100,12 @@ async fn run(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> { file_opts.clone(), )?; - let mut commando_sock = proxmox_rest_server::CommandSocket::new( + let mut command_sock = proxmox_rest_server::CommandSocket::new( proxmox_rest_server::our_ctrl_sock(), backup_user.gid, ); - proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; - commando_sock.spawn()?; + proxmox_rest_server::register_task_control_commands(&mut command_sock)?; + command_sock.spawn()?; do_update(rpcenv).await }