publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vncserver: extract PrepareLoggingAndXvncKillingFramework()

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-13 18:49:01 +12:00
parent 3f23bddb6b
commit 3522000d1f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
unix/vncserver
View File

@@ -34,7 +34,7 @@ use Time::HiRes qw (sleep);
&ParseAndProcessCliOptions(); &ParseAndProcessCliOptions();
&CreateDotVncDir(); &PrepareLoggingAndXvncKillingFramework();
&DisableLegacyVncAuth(); &DisableLegacyVncAuth();
&SetupXauthorityFile(); &SetupXauthorityFile();
@@ -1017,8 +1017,6 @@ sub ParseAndProcessCliOptions {
$displayNumber = &DetectDisplayNumberFromCliArgs() || $displayNumber = &DetectDisplayNumberFromCliArgs() ||
&GetLowestAvailableDisplayNumber(); &GetLowestAvailableDisplayNumber();
&CheckCliOptionsForBeingValid(); &CheckCliOptionsForBeingValid();
&DefineLogAndPidFilesForDisplayNumber();
} }
sub PrepareDefaultsForPassingToXvnc { sub PrepareDefaultsForPassingToXvnc {
@@ -1081,3 +1079,8 @@ sub DefineLogAndPidFilesForDisplayNumber {
$desktopLog = "$vncUserDir/$host:$displayNumber.log"; $desktopLog = "$vncUserDir/$host:$displayNumber.log";
$pidFile = "$vncUserDir/$host:$displayNumber.pid"; $pidFile = "$vncUserDir/$host:$displayNumber.pid";
} }
sub PrepareLoggingAndXvncKillingFramework {
&CreateDotVncDir();
&DefineLogAndPidFilesForDisplayNumber();
}