explicitly cast non-string settings variables

 * Since envvars config values are always strings, non-string config
   values need to be cast to the expected type.  Bools and Nones have
   been updated to use the `get_bool` and `get_nullable` methods from
   SettingsDict.

Author: felliott

mfr/extensions/image/settings.py

@@ -1,5 +1,6 @@
 from mfr import settings
 
+
 config = settings.child('IMAGE_EXTENSION_CONFIG')
 
 EXPORT_TYPE = config.get('EXPORT_TYPE', 'jpeg')

mfr/extensions/tabular/settings.py

@@ -1,11 +1,12 @@
 from mfr import settings
 from mfr.extensions.tabular import libs
 
+
 config = settings.child('TABULAR_EXTENSION_CONFIG')
 
-MAX_SIZE = config.get('MAX_SIZE', 10000)
-TABLE_WIDTH = config.get('TABLE_WIDTH', 700)
-TABLE_HEIGHT = config.get('TABLE_HEIGHT', 600)
+MAX_SIZE = int(config.get('MAX_SIZE', 10000))
+TABLE_WIDTH = int(config.get('TABLE_WIDTH', 700))
+TABLE_HEIGHT = int(config.get('TABLE_HEIGHT', 600))
 
 LIBS = config.get('LIBS', {
     '.csv': [libs.csv_stdlib],

mfr/extensions/unoconv/settings.py

@@ -2,6 +2,7 @@
 
 from mfr import settings
 
+
 config = settings.child('UNOCONV_EXTENSION_CONFIG')
 
 UNOCONV_BIN = config.get('UNOCONV_BIN', '/usr/bin/unoconv')

mfr/providers/http/settings.py

@@ -1,3 +1,4 @@
 from mfr import settings
 
+
 config = settings.child('HTTP_PROVIDER_CONFIG')

mfr/providers/osf/settings.py

@@ -1,7 +1,6 @@
 from mfr import settings
 
-config = settings.child('OSF_PROVIDER_CONFIG')
 
-# BASE_URL = config.get('BASE_URL', 'http://localhost:5001/')
+config = settings.child('OSF_PROVIDER_CONFIG')
 
 MFR_IDENTIFYING_HEADER = config.get('MFR_IDENTIFYING_HEADER', 'X-Cos-Mfr-Render-Request')

mfr/server/settings.py

@@ -2,30 +2,30 @@
 
 import furl
 
-
 from mfr import settings
 
+
 config = settings.child('SERVER_CONFIG')
 
 STATIC_PATH = config.get('STATIC_PATH', os.path.join(os.path.dirname(__file__), 'static'))
 
 ADDRESS = config.get('ADDRESS', 'localhost')
 PORT = config.get('PORT', 7778)
 
-DEBUG = config.get('DEBUG', False)
+DEBUG = config.get_bool('DEBUG', False)
 
-SSL_CERT_FILE = config.get('SSL_CERT_FILE', None)
-SSL_KEY_FILE = config.get('SSL_KEY_FILE', None)
+SSL_CERT_FILE = config.get_nullable('SSL_CERT_FILE', None)
+SSL_KEY_FILE = config.get_nullable('SSL_KEY_FILE', None)
 
-XHEADERS = config.get('XHEADERS', False)
+XHEADERS = config.get_bool('XHEADERS', False)
 CORS_ALLOW_ORIGIN = config.get('CORS_ALLOW_ORIGIN', '*')
 
-CHUNK_SIZE = config.get('CHUNK_SIZE', 65536)  # 64KB
-MAX_BUFFER_SIZE = config.get('MAX_BUFFER_SIZE', 1024 * 1024 * 100)  # 100MB
+CHUNK_SIZE = int(config.get('CHUNK_SIZE', 65536))  # 64KB
+MAX_BUFFER_SIZE = int(config.get('MAX_BUFFER_SIZE', 1024 * 1024 * 100))  # 100MB
 
 PROVIDER_NAME = config.get('PROVIDER_NAME', 'osf')
 
-CACHE_ENABLED = config.get('CACHE_ENABLED', False)
+CACHE_ENABLED = config.get_bool('CACHE_ENABLED', False)
 CACHE_PROVIDER_NAME = config.get('CACHE_PROVIDER_NAME', 'filesystem')
 CACHE_PROVIDER_SETTINGS = config.get('CACHE_PROVIDER_SETTINGS', {'folder': '/tmp/mfr/'})
 CACHE_PROVIDER_CREDENTIALS = config.get('CACHE_PROVIDER_CREDENTIALS', {})
@@ -45,9 +45,9 @@
 KEEN_API_VERSION = keen_config.get('API_VERSION', '3.0')
 
 keen_private_config = keen_config.child('PRIVATE')
-KEEN_PRIVATE_PROJECT_ID = keen_private_config.get('PROJECT_ID', None)
-KEEN_PRIVATE_WRITE_KEY = keen_private_config.get('WRITE_KEY', None)
+KEEN_PRIVATE_PROJECT_ID = keen_private_config.get_nullable('PROJECT_ID', None)
+KEEN_PRIVATE_WRITE_KEY = keen_private_config.get_nullable('WRITE_KEY', None)
 
 keen_public_config = keen_config.child('PUBLIC')
-KEEN_PUBLIC_PROJECT_ID = keen_public_config.get('PROJECT_ID', None)
-KEEN_PUBLIC_WRITE_KEY = keen_public_config.get('WRITE_KEY', None)
+KEEN_PUBLIC_PROJECT_ID = keen_public_config.get_nullable('PROJECT_ID', None)
+KEEN_PUBLIC_WRITE_KEY = keen_public_config.get_nullable('WRITE_KEY', None)

mfr/settings.py

@@ -152,4 +152,4 @@ def child(key):
 logging.config.dictConfig(logging_config)
 
 
-SENTRY_DSN = config.get('SENTRY_DSN', None)
+SENTRY_DSN = config.get_nullable('SENTRY_DSN', None)