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

Fix #4142: Missing images after upload.

Browse Source
This commit is contained in:
evazion
2019-09-01 13:10:37 -05:00
parent 67100f26eb
commit a932b25608
6 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/logical/danbooru_logger.rb
View File

@@ -3,7 +3,8 @@ class DanbooruLogger
Rails.logger.info(message)
if defined?(::NewRelic)
::NewRelic::Agent.record_custom_event(:spam, message: message, **params)
params = flatten_hash(params).symbolize_keys
::NewRelic::Agent.record_custom_event(:info, message: message, **params)
end
end

2
app/logical/danbooru_maintenance.rb
View File

@@ -9,7 +9,7 @@ module DanbooruMaintenance
def daily
PostPruner.new.prune!
Upload.where('created_at < ?', 1.day.ago).delete_all
Upload.prune!
Delayed::Job.where('created_at < ?', 45.days.ago).delete_all
PostDisapproval.prune!
ForumSubscription.process_all!

29
app/logical/upload_service/utils.rb
View File

@@ -24,31 +24,6 @@ class UploadService
end
end
def delete_file(md5, file_ext, upload_id = nil)
if Post.where(md5: md5).exists?
if upload_id.present? && Upload.where(id: upload_id).exists?
CurrentUser.as_system do
Upload.find(upload_id).update(status: "completed")
end
end
return
end
if upload_id.present? && Upload.where(id: upload_id).exists?
CurrentUser.as_system do
Upload.find(upload_id).update(status: "preprocessed + deleted")
end
end
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :original)
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :large)
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :preview)
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :original)
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :large)
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :preview)
end
def calculate_ugoira_dimensions(source_path)
folder = Zip::File.new(source_path)
Tempfile.open("ugoira-dim-") do |tempfile|
@@ -163,10 +138,6 @@ class UploadService
crop_file.try(:close!)
sample_file.try(:close!)
end
# in case this upload never finishes processing, we need to delete the
# distributed files in the future
DeleteUploadFilesJob.set(wait: 24.hours).perform_later(upload.md5, upload.file_ext, upload.id)
end
# these methods are only really used during upload processing even