zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Better tuning for screenshots

Browse source
This commit is contained in:
Kyle Drake 2016-01-15 20:16:46 -08:00
parent 415d853764
commit 3ef075b24b
1 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
workers/screenshot_worker.rb
View file

@ -6,7 +6,7 @@ require 'open3'
class ScreenshotWorker
SCREENSHOTS_PATH = Site::SCREENSHOTS_ROOT
HARD_TIMEOUT = 20.freeze
HARD_TIMEOUT = 30.freeze
include Sidekiq::Worker
sidekiq_options queue: :screenshots, retry: 3, backtrace: true
@ -27,32 +27,20 @@ class ScreenshotWorker
output: screenshot_output_path
)
rescue Cocaine::ExitStatusError => e
if e.message && e.message.match(/returned 124/)
puts "#{username}/#{path} is timing out, discontinuing"
site = Site[username: username]
site.is_crashing = true
site.save_changes validate: false
return true
=begin
if site.email
EmailWorker.perform_async({
from: 'web@neocities.org',
to: site.email,
subject: "[NeoCities] The web page \"#{path}\" on your site (#{username}.neocities.org) is slow",
body: "Hi there! This is an automated email to inform you that we're having issues loading your site to take a "+
"screenshot. It is possible that this is an error specific to our screenshot program, but it is much more "+
"likely that your site is too slow to be used with browsers. We don't want Neocities sites crashing browsers, "+
"so we're taking steps to inform you and see if you can resolve the issue. "+
"We may have to de-list your web site from being viewable in our browse page if it is not resolved shortly. "+
"We will review the site manually before taking this step, so don't worry if your site is fine and we made "+
"a mistake."+
"\n\nOur best,\n- Neocities"
})
end
=end
else
raise
end
raise e
# We set is_crashing after retries now, but use this code to go back to instant:
#if e.message && e.message.match(/returned 124/)
# puts "#{username}/#{path} is timing out, discontinuing"
# site = Site[username: username]
# site.is_crashing = true
# site.save_changes validate: false
# return true
#
#else
# raise
#end
end
img_list = Magick::ImageList.new
@ -82,4 +70,29 @@ class ScreenshotWorker
}
end
end
sidekiq_retries_exhausted do |msg|
username, path = msg['args']
site = Site[username: username]
site.is_crashing = true
site.save_changes validate: false
=begin
if site.email
EmailWorker.perform_async({
from: 'web@neocities.org',
to: site.email,
subject: "[NeoCities] The web page \"#{path}\" on your site (#{username}.neocities.org) is slow",
body: "Hi there! This is an automated email to inform you that we're having issues loading your site to take a "+
"screenshot. It is possible that this is an error specific to our screenshot program, but it is much more "+
"likely that your site is too slow to be used with browsers. We don't want Neocities sites crashing browsers, "+
"so we're taking steps to inform you and see if you can resolve the issue. "+
"We may have to de-list your web site from being viewable in our browse page if it is not resolved shortly. "+
"We will review the site manually before taking this step, so don't worry if your site is fine and we made "+
"a mistake."+
"\n\nOur best,\n- Neocities"
})
end
=end
end
end