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

revert to old catcher for phantomjs for now

Browse source
This commit is contained in:
Kyle Drake 2015-09-02 17:23:51 -07:00
parent ab6b174ac5
commit 1b6e12a831
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
workers/screenshot_worker.rb
View file

@ -5,13 +5,12 @@ require 'thread'
require 'open3' require 'open3'
# Don't judge - Ruby handling of timeouts is a joke.. # Don't judge - Ruby handling of timeouts is a joke..
=begin
module Phantomjs module Phantomjs
def self.run(*args, &block) def self.run(*args, &block)
pid = nil pid = nil
stdin, stdout, stderr, wait_thr = nil stdin, stdout, stderr, wait_thr = nil
begin begin
Timeout::timeout(50) do Timeout::timeout(30) do
stdin, stdout, stderr, wait_thr = Open3.popen3(path, *args) stdin, stdout, stderr, wait_thr = Open3.popen3(path, *args)
pid = wait_thr.pid pid = wait_thr.pid
wait_thr.join wait_thr.join
@ -28,7 +27,6 @@ module Phantomjs
# :nocov: # :nocov:
end end
end end
=end
class ScreenshotWorker class ScreenshotWorker
SCREENSHOTS_PATH = Site::SCREENSHOTS_ROOT SCREENSHOTS_PATH = Site::SCREENSHOTS_ROOT
@ -50,7 +48,7 @@ class ScreenshotWorker
maxRenderWait: 25000, maxRenderWait: 25000,
cutoffWait: 30000 cutoffWait: 30000
) )
rescue => e rescue Timeout::Error
# :nocov: # :nocov:
puts "#{username}/#{path} is timing out, discontinuing" puts "#{username}/#{path} is timing out, discontinuing"
site = Site[username: username] site = Site[username: username]