Merge pull request #1069 from drbyte/stop-non-root-services

Stop non-root homebrew services during restarts

Author: mattstauffer

cli/Valet/Brew.php

@@ -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);
             }
         }

tests/BrewTest.php

@@ -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');