Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-16 06:51:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-13619' into 'rails'
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
fix: deprecar Dir#chdir #13619

Closes #13619, #13715, #13716, and #13717

See merge request sutty/sutty!193
This commit is contained in:
Elihu 2023-09-27 15:18:50 +00:00
commit 9bd591ec27
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/models/deploy.rb
View file

@ -65,22 +65,20 @@ class Deploy < ApplicationRecord
lines = [] lines = []
time_start time_start
Dir.chdir(site.path) do Open3.popen2e(env, cmd, unsetenv_others: true, chdir: site.path) do |_, o, t|
Open3.popen2e(env, cmd, unsetenv_others: true) do |_, o, t| # TODO: Enviar a un websocket para ver el proceso en vivo?
# TODO: Enviar a un websocket para ver el proceso en vivo? Thread.new do
Thread.new do o.each do |line|
o.each do |line| lines << line
lines << line
puts line if output puts line if output
end
rescue IOError => e
lines << e.message
puts e.message if output
end end
rescue IOError => e
r = t.value lines << e.message
puts e.message if output
end end
r = t.value
end end
time_stop time_stop

8
app/models/site.rb
View file

@ -447,6 +447,10 @@ class Site < ApplicationRecord
find_by(name: "#{Site.domain}.") find_by(name: "#{Site.domain}.")
end end
def self.one_at_a_time
@@one_at_a_time ||= Thread::Mutex.new
end
def reset def reset
@read = false @read = false
@layouts = nil @layouts = nil
@ -553,7 +557,9 @@ class Site < ApplicationRecord
end end
def run_in_path(&block) def run_in_path(&block)
Dir.chdir path, &block Site.one_at_a_time.synchronize do
Dir.chdir path, &block
end
end end
# Instala las gemas cuando es necesario: # Instala las gemas cuando es necesario: