fix: resolves #1443 - closes image when context cleanup

tests/test_context.py

@@ -9,8 +9,10 @@
 # Copyright (c) 2011 globo.com thumbor@googlegroups.com
 
 from unittest import TestCase, mock
+from os.path import abspath, dirname, join
 
 from preggy import expect
+from PIL._util import DeferredError
 
 from thumbor.config import Config
 from thumbor.context import (
@@ -24,6 +26,9 @@
 from thumbor.importer import Importer
 from thumbor.metrics.logger_metrics import Metrics
 
+FIXTURES_PATH = abspath(join(dirname(__file__), "fixtures/"))
+STORAGE_PATH = join(FIXTURES_PATH, "images")
+
 
 class ContextTestCase(TestCase):
     @staticmethod
@@ -103,6 +108,27 @@ def test_can_server_app_class_override_config():
 
         expect(ctx.app_class).to_equal("server.app")
 
+    def test_should_cleanup_context(self):
+        cfg = Config()
+        importer = Importer(cfg)
+        importer.import_modules()
+
+        ctx = Context(config=cfg, importer=importer)
+        ctx.request = RequestParameters()
+        ctx.request.engine = ctx.modules.engine
+
+        with open(join(STORAGE_PATH, "1bit.png"), "rb") as image_file:
+            buffer = image_file.read()
+
+        ctx.modules.engine.load(buffer, "PNG")
+        expect(ctx.modules.engine.image).not_to_be_null()
+        expect(ctx.modules.engine.image.fp).not_to_be_null()
+
+        ctx.cleanup()
+
+        expect(ctx.modules.engine.image.fp).to_be_null()
+        expect(ctx.modules.engine.image.im).to_be_instance_of(DeferredError)
+
 
 class ServerParametersTestCase(TestCase):
     @staticmethod

thumbor/context.py

@@ -69,10 +69,17 @@ def __enter__(self):
         return self
 
     def __exit__(self, exception_type, value, traceback):
-        if self.modules:
+        if self.thread_pool:
+            self.thread_pool.cleanup()
+
+        self.cleanup()
+
+    def cleanup(self):
+        if hasattr(self, "modules") and self.modules:
             self.modules.cleanup()
 
-        self.thread_pool.cleanup()
+        if hasattr(self, "request") and self.request.engine:
+            self.request.engine.cleanup()
 
 
 class ServerParameters:  # pylint: disable=too-many-instance-attributes
@@ -307,3 +314,5 @@ def __init__(self, context, importer):
     def cleanup(self):
         if self.engine:
             self.engine.cleanup()
+        if self.gif_engine:
+            self.gif_engine.cleanup()

thumbor/engines/gif.py

@@ -172,3 +172,6 @@ def convert_to_grayscale(self, update_image=True, alpha=True):
     # gif have no exif data and thus can't be auto oriented
     def reorientate(self, override_exif=True):
         pass
+
+    def cleanup(self):
+        self.buffer = None

thumbor/engines/pil.py

@@ -599,3 +599,7 @@ def strip_icc(self):
 
     def strip_exif(self):
         self.exif = None
+
+    def cleanup(self):
+        if self.image:
+            self.image.close()

thumbor/handlers/__init__.py

@@ -672,16 +672,7 @@ def _ensure_bytes(self, results):
         return results
 
     def _cleanup(self):
-        self.context.request_handler = None
-
-        if hasattr(self.context, "request"):
-            self.context.request.engine = None
-        self.context.modules = None
-        self.context.filters_factory = None
-        self.context.metrics = None
-        self.context.thread_pool = None
-        self.context.transformer = None
-        self.context = None  # Handlers should not override __init__ pylint: disable=attribute-defined-outside-init
+        self.context.cleanup()
 
     async def _write_results_to_client(self, results, content_type):
         max_age = self.context.config.MAX_AGE