Skip to content

A platform for community discussion. Free, open, simple.

DEV: Replace simple subprocesses with Ruby APIs (#42076)

Alan Guo Xiang Tanc0fae8248a18
diff --git a/lib/backup_restore/backup_file_handler.rb b/lib/backup_restore/backup_file_handler.rb
index e0af419a4a6..690b350b670 100644
--- a/lib/backup_restore/backup_file_handler.rb
+++ b/lib/backup_restore/backup_file_handler.rb
@@ -74,7 +74,7 @@ module BackupRestore
def download_archive_to_tmp_directory
log "Downloading archive from URL to tmp directory..."
tmpfile = self.class.download(@url)
- Discourse::Utils.execute_command("mv", tmpfile.path, @archive_path)
+ FileUtils.mv(tmpfile.path, @archive_path)
ensure
tmpfile&.unlink
end
diff --git a/lib/backup_restore/creator.rb b/lib/backup_restore/creator.rb
index f91ac0cf95c..384530418b0 100644
--- a/lib/backup_restore/creator.rb
+++ b/lib/backup_restore/creator.rb
@@ -203,14 +203,11 @@ module BackupRestore
archive_filename = File.join(@archive_directory, @backup_filename)
- Discourse::Utils.execute_command(
- "mv",
- @dump_filename,
- archive_filename,
- failure_message: "Failed to move database dump file.",
- )
+ FileUtils.mv(@dump_filename, archive_filename)
remove_tmp_directory
+ rescue SystemCallError => error
+ raise "Failed to move database dump file.\n#{error.message}"
end
def create_archive
@@ -219,8 +216,10 @@ module BackupRestore
tar_filename = "#{@archive_basename}.tar"
log "Making sure archive does not already exist..."
- Discourse::Utils.execute_command("rm", "-f", tar_filename)
- Discourse::Utils.execute_command("rm", "-f", "#{tar_filename}.gz")
+ [tar_filename, "#{tar_filename}.gz"].each do |filename|
+ File.delete(filename)
+ rescue Errno::ENOENT
+ end
log "Creating empty archive..."
Discourse::Utils.execute_command(
diff --git a/lib/backup_restore/local_backup_store.rb b/lib/backup_restore/local_backup_store.rb
index f3abe3604b5..96fd45ac00d 100644
--- a/lib/backup_restore/local_backup_store.rb
+++ b/lib/backup_restore/local_backup_store.rb
@@ -43,7 +43,9 @@ module BackupRestore
def download_file(filename, destination, failure_message = "")
path = path_from_filename(filename)
- Discourse::Utils.execute_command("cp", path, destination, failure_message: failure_message)
+ FileUtils.cp(path, destination)
+ rescue SystemCallError => error
+ raise [failure_message, error.message].filter(&:present?).join("\n")
end
private
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 7352dbbff39..938f055ab3b 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -130,7 +130,7 @@ class Demon::Sidekiq < ::Demon::Base
# Sidekiq not as high priority as web, in this environment it is forked so a web is very
# likely running
- Discourse::Utils.execute_command("renice", "-n", "5", "-p", Process.pid.to_s)
+ Process.setpriority(Process::PRIO_PROCESS, Process.pid, 5)
cli.parse(options)
load Rails.root + "config/initializers/100-sidekiq.rb"
diff --git a/lib/discourse.rb b/lib/discourse.rb
index d89f932c9d6..81252e1d1cd 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -114,7 +114,7 @@ module Discourse
next if File.symlink?(destination) && File.readlink(destination) == source
temp_destination = Rails.root.join("tmp", SecureRandom.hex).to_s
- execute_command("ln", "-s", source, temp_destination)
+ File.symlink(source, temp_destination)
begin
File.rename(temp_destination, destination)
diff --git a/lib/discourse_ip_info.rb b/lib/discourse_ip_info.rb
index 94c597a2bd8..549a72610ad 100644
--- a/lib/discourse_ip_info.rb
+++ b/lib/discourse_ip_info.rb
@@ -71,8 +71,8 @@ class DiscourseIpInfo
dir = "#{Dir.tmpdir}/#{SecureRandom.hex}"
- Discourse::Utils.execute_command("mkdir", "-p", dir)
- Discourse::Utils.execute_command("cp", gz_file.path, "#{dir}/#{filename}")
+ FileUtils.mkdir_p(dir)
+ FileUtils.cp(gz_file.path, "#{dir}/#{filename}")
Discourse::Utils.execute_command("tar", "-xzvf", "#{dir}/#{filename}", chdir: dir)
Dir["#{dir}/**/*.mmdb"].each { |f| FileUtils.mv(f, mmdb_path(name)) }
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 0d430800686..2b2bcd3b8d6 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -888,7 +888,7 @@ class Plugin::Instance
if Dir.exist?(public_data)
target = Rails.root.to_s + "/public/plugins/"
- Discourse::Utils.execute_command("mkdir", "-p", target)
+ FileUtils.mkdir_p(target)
target << name.gsub(/\s/, "_")
Discourse::Utils.atomic_ln_s(public_data, target)
diff --git a/script/discourse b/script/discourse
index e6189cc7d7d..cc2c2df3691 100755
--- a/script/discourse
+++ b/script/discourse
@@ -182,8 +182,7 @@ class DiscourseCLI < Thor
store.upload_file(filename, tmpfile.path, content_type)
else
puts "Saving backup file to local store..."
- Discourse::Utils.execute_command(
- "mv",
+ FileUtils.mv(
tmpfile.path,
File.join(BackupRestore::LocalBackupStore.base_directory, filename),
)