phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 00:20:08 +01:00
Code Activity

Stop non-root homebrew services during restarts

Browse Source 
This is intended to assist with avoiding having competing non-root instances of valet dependency services running due to userland use of brew CLI commands.

Now, when running `valet stop` or `valet restart` it will (silently) attempt to stop the non-root instance (ignoring any errors thrown), before stopping (and/or starting) the sudo/root instance which is normally used.

(Though obvious, I'll point out that this only applies to services Valet manages.)

Fixes #1057
This commit is contained in:
Chris Brown
2021-06-13 01:07:17 -04:00
parent 1aad1e072d
commit c549c1786a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/Valet/Brew.php
View File

@@ -197,7 +197,11 @@ function restartService($services)
if ($this->installed($service)) {
info("Restarting {$service}...");
// first we ensure that the service is not incorrectly running as non-root
$this->cli->quietly('brew services stop '.$service);
// stop the actual/correct sudo version
$this->cli->quietly('sudo brew services stop '.$service);
// start correctly as root
$this->cli->quietly('sudo brew services start '.$service);
}
}
@@ -216,6 +220,10 @@ function stopService($services)
if ($this->installed($service)) {
info("Stopping {$service}...");
// first we ensure that the service is not incorrectly running as non-root
$this->cli->quietly('brew services stop '.$service);
// stop the sudo version
$this->cli->quietly('sudo brew services stop '.$service);
}
}

2
tests/BrewTest.php
View File

@@ -117,6 +117,7 @@ public function test_restart_restarts_the_service_using_homebrew_services()
{
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('runAsUser')->once()->with('brew info dnsmasq --json')->andReturn('[{"name":"dnsmasq","full_name":"dnsmasq","aliases":[],"versioned_formulae":[],"versions":{"stable":"1"},"installed":[{"version":"1"}]}]');
$cli->shouldReceive('quietly')->once()->with('brew services stop dnsmasq');
$cli->shouldReceive('quietly')->once()->with('sudo brew services stop dnsmasq');
$cli->shouldReceive('quietly')->once()->with('sudo brew services start dnsmasq');
swap(CommandLine::class, $cli);
@@ -127,6 +128,7 @@ public function test_stop_stops_the_service_using_homebrew_services()
{
$cli = Mockery::mock(CommandLine::class);
$cli->shouldReceive('runAsUser')->once()->with('brew info dnsmasq --json')->andReturn('[{"name":"dnsmasq","full_name":"dnsmasq","aliases":[],"versioned_formulae":[],"versions":{"stable":"1"},"installed":[{"version":"1"}]}]');
$cli->shouldReceive('quietly')->once()->with('brew services stop dnsmasq');
$cli->shouldReceive('quietly')->once()->with('sudo brew services stop dnsmasq');
swap(CommandLine::class, $cli);
resolve(Brew::class)->stopService('dnsmasq');