admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "bundle: handle simultaneous exec --services better"

Browse Source
This commit is contained in:
Mike McQuaid 2025-04-04 15:30:47 +01:00 committed by GitHub
parent fc86107ebe
commit 94db0b2f34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/bundle/commands/exec.rb
View File

@ -179,7 +179,6 @@ module Homebrew
params(
entries: T::Array[Homebrew::Bundle::Dsl::Entry],
_block: T.proc.params(
entry: Homebrew::Bundle::Dsl::Entry,
info: T::Hash[String, T.anything],
service_file: Pathname,
conflicting_services: T::Array[T::Hash[String, T.anything]],
@ -246,20 +245,15 @@ module Homebrew
raise "Failed to get service info for #{entry.name}" if info.nil?
yield entry, info, service_file, conflicting_services
yield info, service_file, conflicting_services
end
end
sig { params(entries: T::Array[Homebrew::Bundle::Dsl::Entry], _block: T.nilable(T.proc.void)).void }
private_class_method def self.run_services(entries, &_block)
entries_to_stop = []
services_to_restart = []
map_service_info(entries) do |entry, info, service_file, conflicting_services|
# Don't restart if already running this version
loaded_file = Pathname.new(info["loaded_file"].to_s)
next if info["running"] && loaded_file&.file? && loaded_file&.realpath == service_file.realpath
map_service_info(entries) do |info, service_file, conflicting_services|
if info["running"] && !Bundle::BrewServices.stop(info["name"], keep: true)
opoo "Failed to stop #{info["name"]} service"
end
@ -275,8 +269,6 @@ module Homebrew
unless Bundle::BrewServices.run(info["name"], file: service_file)
opoo "Failed to start #{info["name"]} service"
end
entries_to_stop << entry
end
return unless block_given?
@ -285,7 +277,7 @@ module Homebrew
yield
ensure
# Do a full re-evaluation of services instead state has changed
stop_services(entries_to_stop)
stop_services(entries)
services_to_restart.each do |service|
next if Bundle::BrewServices.run(service)
@ -297,7 +289,7 @@ module Homebrew
sig { params(entries: T::Array[Homebrew::Bundle::Dsl::Entry]).void }
private_class_method def self.stop_services(entries)
map_service_info(entries) do |_, info, _, _|
map_service_info(entries) do |info, _, _|
next unless info["loaded"]
# Try avoid services not started by `brew bundle services`

1
Library/Homebrew/test/bundle/commands/exec_spec.rb
View File

@ -185,7 +185,6 @@ RSpec.describe Homebrew::Bundle::Commands::Exec do
allow(pkgconf).to receive(:any_version_installed?).and_return(false)
allow_any_instance_of(Pathname).to receive(:file?).and_return(true)
allow_any_instance_of(Pathname).to receive(:realpath) { |path| path }
allow(described_class).to receive(:exit!).and_return(nil)
end