vncserver: extract DefineLogAndPidFilesForDisplayNumber()
This commit is contained in:
@@ -33,8 +33,6 @@ use Time::HiRes qw (sleep);
|
|||||||
&SetGlobalVariables();
|
&SetGlobalVariables();
|
||||||
|
|
||||||
&ParseAndProcessCliOptions();
|
&ParseAndProcessCliOptions();
|
||||||
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
|
|
||||||
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
|
||||||
|
|
||||||
&CreateDotVncDir();
|
&CreateDotVncDir();
|
||||||
|
|
||||||
@@ -1024,6 +1022,8 @@ sub ParseAndProcessCliOptions {
|
|||||||
$displayNumber = &DetectDisplayNumberFromCliArgs() ||
|
$displayNumber = &DetectDisplayNumberFromCliArgs() ||
|
||||||
&GetLowestAvailableDisplayNumber();
|
&GetLowestAvailableDisplayNumber();
|
||||||
&CheckCliOptionsForBeingValid();
|
&CheckCliOptionsForBeingValid();
|
||||||
|
|
||||||
|
&DefineLogAndPidFilesForDisplayNumber();
|
||||||
}
|
}
|
||||||
|
|
||||||
sub PrepareDefaultsForPassingToXvnc {
|
sub PrepareDefaultsForPassingToXvnc {
|
||||||
@@ -1081,3 +1081,8 @@ sub IsProcessRunning {
|
|||||||
|
|
||||||
kill 0, $pid;
|
kill 0, $pid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub DefineLogAndPidFilesForDisplayNumber {
|
||||||
|
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
|
||||||
|
$pidFile = "$vncUserDir/$host:$displayNumber.pid";
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user