Issue 36 - Add timeout to create image (#37)

* Refactor * Add timeout to create image * Kill phantomjs after screnshot * Change code to prevent exceptions * Refactor
collective · Jan 25, 2017 · 2eeef92 · 2eeef92
1 parent 5e9c7bd
commit 2eeef92
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,5 +4,4 @@ Changelog
 1.0a1 (unreleased)
 ------------------
 
-- Fix extra space between text and quotes (pseudo element).
-  [rodfersou]
+- Initial release.
diff --git a/src/collective/behavior/featuredimage/subscriber.py b/src/collective/behavior/featuredimage/subscriber.py
@@ -4,18 +4,23 @@
 from plone.namedfile.file import NamedBlobImage
 from selenium import webdriver
 
+import signal
 import transaction
 
 
 def _get_screenshot(page):
     """Get screenshot of Fetured Image"""
-    driver = webdriver.PhantomJS()
+    browser = webdriver.PhantomJS()
     # Use minimun image size while don't break image proportion
-    driver.set_window_size(1300, 1300)
-    driver.get(page)
-    data = driver.get_screenshot_as_png()
+    browser.set_window_size(1300, 1300)
+    browser.get(page)
+    data = browser.get_screenshot_as_png()
     # crop image
-    el = driver.find_element_by_id('featuredimage')
+    el = browser.find_element_by_id('featuredimage')
+    # XXX: quit() does not terminate PhantomJS process
+    #      https://github.com/SeleniumHQ/selenium/issues/767
+    browser.service.process.send_signal(signal.SIGTERM)
+    browser.quit()
     location = el.location
     size = el.size
     im = Image.open(StringIO(data))

diff --git a/src/collective/behavior/featuredimage/tests/featuredimage-base.png b/src/collective/behavior/featuredimage/tests/featuredimage-base.png