log transform exceptions to configured logger in webapp.py; use ConfigError instead of ResolverException in some cases

Author: bcail

loris/resolver.py

@@ -123,7 +123,6 @@ def __init__(self, config):
 
     def raise_404_for_ident(self, ident):
         message = 'Source image not found for identifier: %s.' % (ident,)
-        logger.warn(message)
         raise ResolverException(message)
 
     def source_file_path(self, ident):
@@ -211,15 +210,13 @@ def __init__(self, config):
         if 'cache_root' in self.config:
             self.cache_root = self.config['cache_root']
         else:
-            message = 'Server Side Error: Configuration incomplete and cannot resolve. Missing setting for cache_root.'
-            logger.error(message)
-            raise ResolverException(message)
+            message = 'Configuration incomplete and cannot resolve. Missing setting for cache_root.'
+            raise ConfigError(message)
 
         if not self.uri_resolvable and self.source_prefix == '':
-            message = 'Server Side Error: Configuration incomplete and cannot resolve. Must either set uri_resolvable' \
+            message = 'Configuration incomplete and cannot resolve. Must either set uri_resolvable' \
                       ' or source_prefix settings.'
-            logger.error(message)
-            raise ResolverException(message)
+            raise ConfigError(message)
 
     def request_options(self):
         # parameters to pass to all head and get requests;
@@ -458,7 +455,6 @@ def _web_request_url(self, ident):
         # only split identifiers that look like template ids;
         # ignore other requests (e.g. favicon)
         if ':' not in ident:
-            logger.warn('Bad URL request for identifier: %r.', ident)
             raise ResolverException(
                 "Bad URL request made for identifier: %r." % ident
             )

loris/transforms.py

@@ -47,12 +47,12 @@ def _validate_color_profile_conversion_config(config):
 
 
 class _AbstractTransformer(object):
+
     def __init__(self, config):
         _validate_color_profile_conversion_config(config)
         self.config = config
         self.target_formats = config['target_formats']
         self.dither_bitonal_images = config['dither_bitonal_images']
-        logger.debug('Initialized %s.%s', __name__, self.__class__.__name__)
 
     def transform(self, target_fp, image_request, image_info):
         '''
@@ -216,22 +216,11 @@ class PNG_Transformer(_PillowTransformer):
 class _AbstractJP2Transformer(_AbstractTransformer):
     '''
     Shared methods and configuration for the Kakadu and OpenJPEG transformers.
-
-    Exits if OSError is raised during init.
     '''
     def __init__(self, config):
         self.tmp_dp = config['tmp_dp']
-
-        try:
-            os.makedirs(self.tmp_dp, exist_ok=True)
-        except OSError as ose:
-            # Almost certainly a permissions error on one of the required dirs
-            from sys import exit
-            from os import strerror
-            logger.fatal('%s (%s)', strerror(ose.errno), ose.filename)
-            logger.fatal('Exiting')
-            exit(77)
-
+        #if there's an error making the dirs, just let it propagate up
+        os.makedirs(self.tmp_dp, exist_ok=True)
         super().__init__(config)
         self.transform_timeout = config.get('timeout', 120)
 
@@ -330,8 +319,7 @@ def transform(self, target_fp, image_request, image_info):
             try:
                 self._process(opj_cmd, target_fp, image_request, image_info, tmp_img_fp)
             except Exception as e:
-                logger.error(f'openjpeg transform error: {e}')
-                raise TransformException('error generating derivative image: see log')
+                raise TransformException(f'openjpeg transform error: {e}')
 
 
 class KakaduJP2Transformer(_AbstractJP2Transformer):
@@ -391,5 +379,4 @@ def transform(self, target_fp, image_request, image_info):
             try:
                 self._process(kdu_cmd, target_fp, image_request, image_info, tmp_img_fp)
             except Exception as e:
-                logger.error(f'kakadu transform error: {e}')
-                raise TransformException('error generating derivative image: see log')
+                raise TransformException(f'kakadu transform error: {e}')

loris/webapp.py

@@ -701,7 +701,8 @@ def get_img(self, request, ident, region, size, rotation, quality, target_fmt, b
                 )
 
             except TransformException as te:
-                return ServerSideErrorResponse(te)
+                self.logger.error(f'{ident} transform exception: {te}')
+                return ServerSideErrorResponse('error generating derivative image: see log')
             except (RequestException, SyntaxException) as e:
                 return BadRequestResponse(str(e))
             except (CalledProcessError,IOError) as e:

tests/resolver_t.py

@@ -13,7 +13,7 @@
 import pytest
 import responses
 
-from loris.loris_exception import ResolverException
+from loris.loris_exception import ResolverException, ConfigError
 from loris.resolver import (
     _AbstractResolver,
     SimpleHTTPResolver,
@@ -233,15 +233,14 @@ def test_simple_http_resolver(self):
         self._mock_urls()
 
         # First we test with no config...
-        config = {
-        }
-        self.assertRaises(ResolverException, lambda: SimpleHTTPResolver(config))
+        config = {}
+        self.assertRaises(ConfigError, lambda: SimpleHTTPResolver(config))
 
         # Then we test missing source_prefix and uri_resolvable
         config = {
             'cache_root' : self.SRC_IMAGE_CACHE
         }
-        self.assertRaises(ResolverException, lambda: SimpleHTTPResolver(config))
+        self.assertRaises(ConfigError, lambda: SimpleHTTPResolver(config))
 
         # Then we test with the full config...
         #TODO: More granular testing of these settings...
@@ -537,7 +536,7 @@ class Test_TemplateHTTPResolver(object):
     }
 
     def test_template_http_resolver_with_no_config_is_error(self):
-        with pytest.raises(ResolverException):
+        with pytest.raises(ConfigError):
             TemplateHTTPResolver({})
 
     def test_allow_no_template_config(self):

tests/simple_http_resolver_ut.py

@@ -5,7 +5,7 @@
 import responses
 
 from loris.resolver import SimpleHTTPResolver
-from loris.loris_exception import ResolverException
+from loris.loris_exception import ResolverException, ConfigError
 
 
 class SimpleHTTPResolverTest(unittest.TestCase):
@@ -151,7 +151,7 @@ def setUp(self):
     def test_no_config(self):
         config = {}
         self.assertRaises(
-                ResolverException,
+                ConfigError,
                 lambda: SimpleHTTPResolver(config)
         )
 
@@ -160,7 +160,7 @@ def test_missing_required_config(self):
             'cache_root': self.cache_dir
         }
         self.assertRaises(
-                ResolverException,
+                ConfigError,
                 lambda: SimpleHTTPResolver(config)
         )