Skip to content

fix(media-stack panel): background only the installer in the start command #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
K4r3s-git wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −1
Open

fix(media-stack panel): background only the installer in the start command #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion etc/skel/www/userMediaStackPanel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,12 @@ function pmssMediaStackPanelStartCommandBuild(string $home, string $username): s
$scriptPath = pmssCustomerHomePath($home, 'install-media-stack.sh');
$pidPath = pmssCustomerHomePath($home, '.install-media-stack-web.pid');

// Background only the installer: a trailing `&` over the whole && list would also
// background `rm` (racing away the pid file) and keep shell_exec's pipe open until
// the install ends, so the request dies with the installer's lighttpd restart.
$innerCommand = 'cd '.escapeshellarg($home)
.' && rm -f -- '.escapeshellarg($pidPath)
.' && nohup /bin/bash '.escapeshellarg($scriptPath).' >/dev/null 2>&1 & echo $! > '.escapeshellarg($pidPath);
.' && { nohup /bin/bash '.escapeshellarg($scriptPath).' </dev/null >/dev/null 2>&1 & echo $! > '.escapeshellarg($pidPath).'; }';

return 'HOME='.escapeshellarg($home)
.' USER='.escapeshellarg($username)
Expand Down
17 changes: 17 additions & 0 deletions scripts/lib/tests/development/mediaStackPanelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,23 @@ public function testStartCommandIncludesPidFileAndScriptPath(): void
$this->assertStringContainsAllStrings(['.install-media-stack-web.pid', 'install-media-stack.sh', "USER='alice'"], $command);
}

public function testStartCommandReturnsAtOnceAndKeepsPidFile(): void
{
$home = $this->pmssMakeTempDir('pmss-media-start-launch-');
$this->pmssWriteExecutableFile($home.'/install-media-stack.sh', "#!/bin/bash\nsleep 3\n");

$started = microtime(true);
shell_exec(\pmssMediaStackPanelStartCommandBuild($home, 'alice'));
$elapsed = microtime(true) - $started;
$pid = (int) trim((string) @file_get_contents($home.'/.install-media-stack-web.pid'));

$this->assertTrue($elapsed < 2.0, 'launch must not wait for the installer ('.round($elapsed, 2).'s)');
$this->assertTrue($pid > 0 && is_dir('/proc/'.$pid), 'pid file must name the running installer');
if ($pid > 0 && function_exists('posix_kill')) {
posix_kill($pid, 15);
}
}

public function testRecoveryCommandUsesFixedInstallerMode(): void
{
$command = \pmssMediaStackPanelRecoveryCommandBuild('/home/alice', 'alice');
Expand Down