extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-06-22 18:51:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: extract WarnUserXvncNotStartedAndExit()

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-02 00:27:11 +12:00
parent 7954cc506c
commit df5d3e506d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unix/vncserver
View File

@ -119,12 +119,7 @@ sleep(3);
&IfXvncDidntStartTryFixingFontPathAndStartXvncAgain(); &IfXvncDidntStartTryFixingFontPathAndStartXvncAgain();
unless (&IsXvncRunning()) { unless (&IsXvncRunning()) {
warn "Could not start Xvnc.\n\n"; &WarnUserXvncNotStartedAndExit();
unlink $pidFile;
open(LOG, "<$desktopLog");
while (<LOG>) { print; }
close(LOG);
die "\n";
} }
warn "\nNew '$desktopName' desktop is $host:$displayNumber\n"; warn "\nNew '$desktopName' desktop is $host:$displayNumber\n";
@ -952,3 +947,12 @@ sub IfXvncDidntStartTryFixingFontPathAndStartXvncAgain {
sub IsXvncRunning { sub IsXvncRunning {
kill 0, `cat $pidFile`; kill 0, `cat $pidFile`;
} }
sub WarnUserXvncNotStartedAndExit {
warn "Could not start Xvnc.\n\n";
unlink $pidFile;
open(LOG, "<$desktopLog");
while (<LOG>) { print; }
close(LOG);
die "\n";
}