mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-03 20:15:45 +00:00
main: Remove API socket when exiting
When exiting remove the API socket from the filesystem. Fixes: #1241 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
c22b788b47
commit
be1b6bc1e1
17
src/main.rs
17
src/main.rs
@ -346,11 +346,7 @@ fn create_app<'a, 'b>(
|
|||||||
app
|
app
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_vmm(cmd_arguments: ArgMatches) -> Result<(), Error> {
|
fn start_vmm(cmd_arguments: ArgMatches, api_socket_path: &str) -> Result<(), Error> {
|
||||||
let api_socket_path = cmd_arguments
|
|
||||||
.value_of("api-socket")
|
|
||||||
.expect("Missing argument: api-socket");
|
|
||||||
|
|
||||||
let (api_request_sender, api_request_receiver) = channel();
|
let (api_request_sender, api_request_receiver) = channel();
|
||||||
let api_evt = EventFd::new(EFD_NONBLOCK).map_err(Error::CreateAPIEventFd)?;
|
let api_evt = EventFd::new(EFD_NONBLOCK).map_err(Error::CreateAPIEventFd)?;
|
||||||
|
|
||||||
@ -479,10 +475,19 @@ fn main() {
|
|||||||
start_net_backend(backend_command);
|
start_net_backend(backend_command);
|
||||||
} else if let Some(backend_command) = cmd_arguments.value_of("block-backend") {
|
} else if let Some(backend_command) = cmd_arguments.value_of("block-backend") {
|
||||||
start_block_backend(backend_command);
|
start_block_backend(backend_command);
|
||||||
} else if let Err(e) = start_vmm(cmd_arguments) {
|
} else {
|
||||||
|
let api_socket_path = cmd_arguments
|
||||||
|
.value_of("api-socket")
|
||||||
|
.expect("Missing argument: api-socket")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
if let Err(e) = start_vmm(cmd_arguments, &api_socket_path) {
|
||||||
eprintln!("{}", e);
|
eprintln!("{}", e);
|
||||||
|
std::fs::remove_file(api_socket_path).ok();
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
std::fs::remove_file(api_socket_path).ok();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
Loading…
Reference in New Issue
Block a user