pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for residual socket files and clean them

Browse source
This commit is contained in:
Kunal Mohan 2021-05-25 16:26:31 +05:30
parent 151deb3235
commit df6d6cb3a7
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sessions.rs
View file

@ -1,6 +1,10 @@
use std::os::unix::fs::FileTypeExt; use std::os::unix::fs::FileTypeExt;
use std::{fs, io, process}; use std::{fs, io, process};
use zellij_utils::consts::ZELLIJ_SOCK_DIR; use zellij_utils::{
consts::ZELLIJ_SOCK_DIR,
interprocess::local_socket::LocalSocketStream,
ipc::{ClientToServerMsg, IpcSenderWithContext},
};
fn get_sessions() -> Result<Vec<String>, io::ErrorKind> { fn get_sessions() -> Result<Vec<String>, io::ErrorKind> {
match fs::read_dir(&*ZELLIJ_SOCK_DIR) { match fs::read_dir(&*ZELLIJ_SOCK_DIR) {
@ -8,8 +12,9 @@ fn get_sessions() -> Result<Vec<String>, io::ErrorKind> {
let mut sessions = Vec::new(); let mut sessions = Vec::new();
files.for_each(|file| { files.for_each(|file| {
let file = file.unwrap(); let file = file.unwrap();
if file.file_type().unwrap().is_socket() { let file_name = file.file_name().into_string().unwrap();
sessions.push(file.file_name().into_string().unwrap()); if file.file_type().unwrap().is_socket() && assert_socket(&file_name) {
sessions.push(file_name);
} }
}); });
Ok(sessions) Ok(sessions)
@ -84,3 +89,21 @@ pub(crate) fn assert_session_ne(name: &str) {
}; };
process::exit(exit_code); process::exit(exit_code);
} }
fn assert_socket(name: &str) -> bool {
let path = &*ZELLIJ_SOCK_DIR.join(name);
match LocalSocketStream::connect(path) {
Ok(stream) => {
IpcSenderWithContext::new(stream).send(ClientToServerMsg::ClientExited);
true
}
Err(e) => {
if e.kind() == io::ErrorKind::ConnectionRefused {
drop(fs::remove_file(path));
false
} else {
true
}
}
}
}