hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill --cm-no-ui

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-03-30 21:54:20 +08:00
parent f91514e164
commit 39917c174a
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/linux.rs
View File

@ -230,6 +230,9 @@ fn stop_xorg_subprocess() {
let _ = run_cmds(&format!( let _ = run_cmds(&format!(
r##"ps -ef | grep '/etc/rustdesk/xorg.conf' | grep -v grep | awk '{{printf("kill -9 %d\n", $2)}}' | bash"##, r##"ps -ef | grep '/etc/rustdesk/xorg.conf' | grep -v grep | awk '{{printf("kill -9 %d\n", $2)}}' | bash"##,
)); ));
let _ = run_cmds(format!(
r##"ps -ef | grep -E 'rustdesk +--cm-no-ui' | grep -v grep | awk '{{printf("kill -9 %d\n", $2)}}' | bash"##,
));
} }
fn should_start_server( fn should_start_server(
@ -302,7 +305,7 @@ fn force_stop_server() {
pub fn start_os_service() { pub fn start_os_service() {
stop_rustdesk_servers(); stop_rustdesk_servers();
stop_xorg_subprocess(); stop_subprocess();
start_uinput_service(); start_uinput_service();
let running = Arc::new(AtomicBool::new(true)); let running = Arc::new(AtomicBool::new(true));
@ -337,7 +340,7 @@ pub fn start_os_service() {
&mut last_restart, &mut last_restart,
&mut server, &mut server,
) { ) {
stop_xorg_subprocess(); stop_subprocess();
force_stop_server(); force_stop_server();
start_server(None, &mut server); start_server(None, &mut server);
} }
@ -354,7 +357,7 @@ pub fn start_os_service() {
&mut last_restart, &mut last_restart,
&mut user_server, &mut user_server,
) { ) {
stop_xorg_subprocess(); stop_subprocess();
force_stop_server(); force_stop_server();
start_server( start_server(
Some((desktop.uid.clone(), desktop.username.clone())), Some((desktop.uid.clone(), desktop.username.clone())),
@ -938,7 +941,6 @@ mod desktop {
return; return;
} }
println!("REMOVE ME ================================== desktop: refresh");
let seat0_values = get_values_of_seat0(&[0, 1, 2]); let seat0_values = get_values_of_seat0(&[0, 1, 2]);
if seat0_values[0].is_empty() { if seat0_values[0].is_empty() {
*self = Self::default(); *self = Self::default();
@ -960,11 +962,6 @@ mod desktop {
self.get_display(); self.get_display();
self.get_xauth(); self.get_xauth();
self.set_is_subprocess(); self.set_is_subprocess();
println!(
"REMOVE ME ================================== desktop: {:?}",
self
);
} }
} }
} }

5
src/platform/linux_desktop_manager.rs
View File

@ -128,11 +128,6 @@ impl DesktopManager {
seat0_username = seat0_values[1].clone(); seat0_username = seat0_values[1].clone();
seat0_display_server = get_display_server_of_session(&seat0_values[0]); seat0_display_server = get_display_server_of_session(&seat0_values[0]);
} }
println!(
"REMOVE ME ================================== DesktopManager: {:?}, display server: {}",
&seat0_values, &seat0_display_server
);
Self { Self {
seat0_username, seat0_username,
seat0_display_server, seat0_display_server,

5
src/server/connection.rs
View File

@ -1303,11 +1303,6 @@ impl Connection {
let is_headless = linux_desktop_manager::is_headless(); let is_headless = linux_desktop_manager::is_headless();
let wait_ipc_timeout = 10_000; let wait_ipc_timeout = 10_000;
println!(
"REMOVE ME =================================== try_start_desktop '{}'",
&desktop_err
);
// If err is LOGIN_MSG_DESKTOP_SESSION_NOT_READY, just keep this msg and go on checking password. // If err is LOGIN_MSG_DESKTOP_SESSION_NOT_READY, just keep this msg and go on checking password.
if !desktop_err.is_empty() && desktop_err != LOGIN_MSG_DESKTOP_SESSION_NOT_READY { if !desktop_err.is_empty() && desktop_err != LOGIN_MSG_DESKTOP_SESSION_NOT_READY {
self.send_login_error(desktop_err).await; self.send_login_error(desktop_err).await;