proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-15 00:39:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s/commando/command/

Browse Source 
this has always bugged me

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2023-11-28 09:50:40 +01:00
parent 6c5248fbc6
commit 78fc7b0e94
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/proxmox-backup-api.rs
View File

@ -74,7 +74,7 @@ async fn run() -> Result<(), Error> {
proxmox_backup::auth_helpers::setup_auth_context(true); proxmox_backup::auth_helpers::setup_auth_context(true);
let backup_user = pbs_config::backup_user()?; 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(), proxmox_rest_server::our_ctrl_sock(),
backup_user.gid, backup_user.gid,
); );
@ -94,13 +94,13 @@ async fn run() -> Result<(), Error> {
pbs_buildcfg::API_ACCESS_LOG_FN, pbs_buildcfg::API_ACCESS_LOG_FN,
Some(dir_opts.clone()), Some(dir_opts.clone()),
Some(file_opts.clone()), Some(file_opts.clone()),
&mut commando_sock, &mut command_sock,
)? )?
.enable_auth_log( .enable_auth_log(
pbs_buildcfg::API_AUTH_LOG_FN, pbs_buildcfg::API_AUTH_LOG_FN,
Some(dir_opts.clone()), Some(dir_opts.clone()),
Some(file_opts.clone()), Some(file_opts.clone()),
&mut commando_sock, &mut command_sock,
)?; )?;
let rest_server = RestServer::new(config); 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)?; proxmox_rest_server::write_pid(pbs_buildcfg::PROXMOX_BACKUP_API_PID_FN)?;
let init_result: Result<(), Error> = try_block!({ let init_result: Result<(), Error> = try_block!({
proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; proxmox_rest_server::register_task_control_commands(&mut command_sock)?;
commando_sock.spawn()?; command_sock.spawn()?;
proxmox_rest_server::catch_shutdown_signal()?; proxmox_rest_server::catch_shutdown_signal()?;
proxmox_rest_server::catch_reload_signal()?; proxmox_rest_server::catch_reload_signal()?;
Ok(()) Ok(())

6
src/bin/proxmox-backup-manager.rs
View File

@ -488,12 +488,12 @@ async fn run() -> Result<(), Error> {
file_opts, 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(), proxmox_rest_server::our_ctrl_sock(),
backup_user.gid, backup_user.gid,
); );
proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; proxmox_rest_server::register_task_control_commands(&mut command_sock)?;
commando_sock.spawn()?; command_sock.spawn()?;
} }
let mut rpcenv = CliEnvironment::new(); let mut rpcenv = CliEnvironment::new();

14
src/bin/proxmox-backup-proxy.rs
View File

@ -226,7 +226,7 @@ async fn run() -> Result<(), Error> {
]); ]);
let backup_user = pbs_config::backup_user()?; 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(), proxmox_rest_server::our_ctrl_sock(),
backup_user.gid, backup_user.gid,
); );
@ -243,13 +243,13 @@ async fn run() -> Result<(), Error> {
pbs_buildcfg::API_ACCESS_LOG_FN, pbs_buildcfg::API_ACCESS_LOG_FN,
Some(dir_opts.clone()), Some(dir_opts.clone()),
Some(file_opts.clone()), Some(file_opts.clone()),
&mut commando_sock, &mut command_sock,
)? )?
.enable_auth_log( .enable_auth_log(
pbs_buildcfg::API_AUTH_LOG_FN, pbs_buildcfg::API_AUTH_LOG_FN,
Some(dir_opts.clone()), Some(dir_opts.clone()),
Some(file_opts.clone()), Some(file_opts.clone()),
&mut commando_sock, &mut command_sock,
)?; )?;
let rest_server = RestServer::new(config); let rest_server = RestServer::new(config);
@ -266,7 +266,7 @@ async fn run() -> Result<(), Error> {
let acceptor = Arc::new(Mutex::new(acceptor)); let acceptor = Arc::new(Mutex::new(acceptor));
// to renew the acceptor we just add a command-socket handler // 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); let acceptor = Arc::clone(&acceptor);
move |_value| -> Result<_, Error> { move |_value| -> Result<_, Error> {
log::info!("reloading certificate"); log::info!("reloading certificate");
@ -282,7 +282,7 @@ async fn run() -> Result<(), Error> {
})?; })?;
// to remove references for not configured datastores // 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() { if let Err(err) = DataStore::remove_unused_datastores() {
log::error!("could not refresh datastores: {err}"); 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)?; proxmox_rest_server::write_pid(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)?;
let init_result: Result<(), Error> = try_block!({ let init_result: Result<(), Error> = try_block!({
proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; proxmox_rest_server::register_task_control_commands(&mut command_sock)?;
commando_sock.spawn()?; command_sock.spawn()?;
proxmox_rest_server::catch_shutdown_signal()?; proxmox_rest_server::catch_shutdown_signal()?;
proxmox_rest_server::catch_reload_signal()?; proxmox_rest_server::catch_reload_signal()?;
Ok(()) Ok(())

6
src/bin/proxmox-daily-update.rs
View File

@ -100,12 +100,12 @@ async fn run(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
file_opts.clone(), 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(), proxmox_rest_server::our_ctrl_sock(),
backup_user.gid, backup_user.gid,
); );
proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; proxmox_rest_server::register_task_control_commands(&mut command_sock)?;
commando_sock.spawn()?; command_sock.spawn()?;
do_update(rpcenv).await do_update(rpcenv).await
} }