extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-01-07 14:39:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: extract StartXvncOrExit()

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-10 22:21:52 +12:00
parent cc90fe9ff6
commit 8ca36e349e
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
unix/vncserver
View File

@ -49,22 +49,7 @@ if ($kasmAuthEnabled) {
&SetupXauthorityFile(); &SetupXauthorityFile();
# Now start the X VNC Server &StartXvncOrExit();
$cmd = &ConstructXvncCmd();
&DeleteLogLeftFromPreviousXvncRun();
&StartXvncAndRecordPID();
&WaitForXvncToRespond();
if (!&IsXvncRunning() && !&UsingSafeFontPath()) {
&StartXvncWithSafeFontPath();
&WaitForXvncToRespond();
}
unless (&IsXvncRunning()) {
&WarnUserXvncNotStartedAndExit();
}
warn "\nNew '$desktopName' desktop is $host:$displayNumber\n"; warn "\nNew '$desktopName' desktop is $host:$displayNumber\n";
&PrintKasmUsers(); &PrintKasmUsers();
@ -1067,3 +1052,20 @@ sub EnsureAtLeastOneKasmUserExists {
@kasmPasswdUsers = &LoadKasmPasswdUsers(); @kasmPasswdUsers = &LoadKasmPasswdUsers();
} }
} }
sub StartXvncOrExit {
$cmd = &ConstructXvncCmd();
&DeleteLogLeftFromPreviousXvncRun();
&StartXvncAndRecordPID();
&WaitForXvncToRespond();
if (!&IsXvncRunning() && !&UsingSafeFontPath()) {
&StartXvncWithSafeFontPath();
&WaitForXvncToRespond();
}
unless (&IsXvncRunning()) {
&WarnUserXvncNotStartedAndExit();
}
}