jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

storage manager: make rclone path configurable.

Browse Source 
Fix bug where pruning uploads failed because the rclone binary couldn't
be found. The upload pruner runs under cron, which has a fixed default
$PATH of "/bin:/usr/bin", but in production rclone is installed under
/usr/local/bin. This caused the upload pruner to fail, which prevented
the rest of daily maintenance from running.
This commit is contained in:
evazion
2019-12-27 17:13:15 -06:00
parent 159a4cc3d4
commit 56d787a17f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/logical/storage_manager/rclone.rb
View File

@@ -1,10 +1,11 @@
class StorageManager::Rclone < StorageManager class StorageManager::Rclone < StorageManager
class Error < StandardError; end class Error < StandardError; end
attr_reader :remote, :bucket, :rclone_options attr_reader :remote, :bucket, :rclone_path, :rclone_options
def initialize(remote:, bucket:, rclone_options: {}, **options) def initialize(remote:, bucket:, rclone_path: "rclone", rclone_options: {}, **options)
@remote = remote @remote = remote
@bucket = bucket @bucket = bucket
@rclone_path = rclone_path
@rclone_options = rclone_options @rclone_options = rclone_options
super(**options) super(**options)
end end
@@ -24,8 +25,8 @@ class StorageManager::Rclone < StorageManager
end end
def rclone(*args) def rclone(*args)
success = system("rclone", *rclone_options, *args) success = system(rclone_path, *rclone_options, *args)
raise Error, "rclone #{$?}" if !success raise Error, "rclone #{args.join(" ")}: #{$?}" if !success
end end
def key(path) def key(path)