--- a/src/pyams_media/process.py Thu Jan 11 17:12:00 2018 +0100
+++ b/src/pyams_media/process.py Thu Jan 11 17:14:45 2018 +0100
@@ -31,7 +31,7 @@
# import packages
from pyams_utils.registry import set_local_registry, get_utility
-from pyams_utils.zodb import ZEOConnection
+from pyams_utils.zodb import ZODBConnection
from pyams_zmq.handler import ZMQMessageHandler
from pyams_zmq.process import ZMQProcess
from pyramid.threadlocal import manager as threadlocal_manager
@@ -56,24 +56,22 @@
# Check settings
settings = self.settings
logger.debug("Checking conversion parameters: {0}".format(str(settings)))
- zeo_settings = settings.get('zeo')
media_id = settings.get('media')
media_format = settings.get('format')
- if not (zeo_settings and media_id and media_format):
+ if not (media_id and media_format):
logger.warning('Bad conversion request: {0}'.format(str(settings)))
return
converter = registry.queryUtility(IMediaConverter, media_format)
if converter is None:
logger.warning('Missing media converter: {0}'.format(media_format))
return
- # Open ZEO connection
+ # Open ZODB connection
manager = None
- connection_info = ZEOConnection()
- connection_info.update(zeo_settings)
- logger.debug("Opening ZEO connection...")
- storage, db = connection_info.get_connection(get_storage=True)
+ zodb_name = settings.get('zodb_name')
+ logger.debug("Opening ZODB connection...")
+ zodb = ZODBConnection(name=zodb_name)
+ connection = zodb.get_connection()
try:
- connection = db.open()
root = connection.root()
logger.debug("Getting connection root {0!r}".format(root))
application_name = registry.settings.get(PYAMS_APPLICATION_SETTINGS_KEY, PYAMS_APPLICATION_DEFAULT_NAME)
@@ -113,7 +111,6 @@
if manager is not None:
manager.abort()
connection.close()
- storage.close()
threadlocal_manager.pop()