Merge pull request #52 from plone/log_upstream_error_gather

Adding better logging centralization to plone.server namespace, again…

src/plone.server/plone/server/__init__.py

@@ -1,4 +1,11 @@
 # -*- encoding: utf-8 -*-
+# create logging
+import logging
+logger = logging.getLogger('plone.server')
+
+from zope.i18nmessageid import MessageFactory  # noqa
+_ = MessageFactory('plone')
+
 # load the patch before anything else.
 from plone.server import patch  # noqa
 # load defined migrations
@@ -7,6 +14,7 @@
 from plone.server import interfaces
 from plone.server import languages
 
+
 import collections
 
 

src/plone.server/plone/server/api/app.py

@@ -5,11 +5,6 @@
 from plone.server.json.interfaces import IResourceSerializeToJson
 from zope.component import getMultiAdapter
 
-import logging
-
-
-logger = logging.getLogger(__name__)
-
 
 @configure.service(context=IApplication, method='GET', permission='plone.AccessContent')
 async def get(context, request):

src/plone.server/plone/server/api/content.py

@@ -5,6 +5,7 @@
 from dateutil.tz import tzlocal
 from plone.server import app_settings
 from plone.server import configure
+from plone.server import _
 from plone.server.api.service import Service
 from plone.server.browser import ErrorResponse
 from plone.server.browser import Response
@@ -27,24 +28,16 @@
 from plone.server.utils import iter_parents
 from zope.component import getMultiAdapter
 from zope.component import queryMultiAdapter
-from zope.i18nmessageid import MessageFactory
+
 from zope.securitypolicy.interfaces import IPrincipalPermissionMap
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.securitypolicy.interfaces import IPrincipalRoleMap
 from zope.securitypolicy.interfaces import IRolePermissionMap
 
-import logging
-
-
-_ = MessageFactory('plone')
-
 
 _zone = tzlocal()
 
 
-logger = logging.getLogger(__name__)
-
-
 @configure.service(context=IResource, method='GET', permission='plone.ViewContent')
 class DefaultGET(Service):
     async def __call__(self):

src/plone.server/plone/server/api/layer.py

@@ -1,8 +1,6 @@
 from plone.server.interfaces import IDefaultLayer  # noqa
-import logging
+from plone.server import logger
 
-
-logger = logging.getLogger('plone.server')
 logger.warn('plone.server.api.layer.IDefaultLayer has been moved to '
             'plone.server.interfaces.IDefaultLayer. This import will '
             'no longer work in version 2.0.0 of plone.server')

src/plone.server/plone/server/api/ws.py

@@ -7,6 +7,7 @@
 from plone.server.api.service import Service
 from plone.server.browser import Response
 from plone.server import configure
+from plone.server import logger
 from plone.server.interfaces import ISite
 from plone.server.interfaces import ITraversableView
 from zope.component import getUtility
@@ -18,9 +19,6 @@
 import ujson
 
 
-logger = logging.getLogger(__name__)
-
-
 @configure.service(context=ISite, method='GET', permission='plone.AccessContent',
                    name='@wstoken')
 class WebsocketGetToken(Service):

src/plone.server/plone/server/async.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
 from dateutil.tz import tzlocal
+from plone.server import _
+from plone.server import logger
 from plone.server.browser import ErrorResponse
 from plone.server.browser import UnauthorizedResponse
 from plone.server.browser import View
@@ -15,11 +17,7 @@
 import logging
 
 
-_ = MessageFactory('plone')
-
-
 _zone = tzlocal()
-logger = logging.getLogger(__name__)
 
 
 class IAsyncUtility(Interface):

src/plone.server/plone/server/catalog/index.py

@@ -6,13 +6,9 @@
 from plone.server.transactions import tm
 from zope.component import queryUtility
 
-import logging
 import transaction
 
 
-logger = logging.getLogger('plone.server')
-
-
 class CommitHook(object):
 
     def __init__(self, site, request):

src/plone.server/plone/server/commands/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from plone.server import logger
 from plone.server.factory import make_app
 from plone.server.testing import FakeRequest
 from plone.server.testing import TestParticipation
@@ -10,8 +11,6 @@
 import sys
 
 
-logger = logging.getLogger('plone.server')
-
 
 MISSING_SETTINGS = {
     "databases": [{

src/plone.server/plone/server/commands/cli.py

@@ -1,4 +1,5 @@
 from plone.server import app_settings
+from plone.server import logger
 from plone.server.commands import Command
 from plone.server.testing import PloneRequester
 from plone.server.testing import TESTING_SETTINGS
@@ -10,9 +11,6 @@
 import time
 
 
-logger = logging.getLogger('plone.server')
-
-
 def format_headers(headers):
     return '\n'.join(['\t{}: {}'.format(n, v)
                       for n, v in headers.items()])

src/plone.server/plone/server/factory.py

@@ -3,6 +3,7 @@
 from pkg_resources import iter_entry_points
 from plone.server import app_settings
 from plone.server import configure
+from plone.server import logger
 from plone.server.async import IAsyncUtility
 from plone.server.auth.users import ANONYMOUS_USER_ID
 from plone.server.auth.users import ROOT_USER_ID
@@ -45,7 +46,6 @@
 import asyncio
 import inspect
 import json
-import logging
 import transaction
 import ZODB.FileStorage
 
@@ -55,8 +55,6 @@
 except ImportError:
     RSA = None
 
-logger = logging.getLogger('plone.server')
-
 
 @implementer(IApplication)
 class ApplicationRoot(object):

src/plone.server/plone/server/jose.py

@@ -17,14 +17,10 @@
 import binascii
 import datetime
 import json
-import logging
 import six
 import zlib
 
 
-logger = logging.getLogger(__name__)
-
-
 __all__ = ['encrypt', 'decrypt', 'sign', 'verify']
 
 

src/plone.server/plone/server/json/deserialize_value.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from dateutil.parser import parse
+from plone.server import logger
 from plone.server.json.interfaces import IJSONToValue
 from zope.component import adapter
 from zope.component import ComponentLookupError
@@ -17,11 +18,6 @@
 from zope.schema.interfaces import ITuple
 from plone.server.interfaces import IJSONField
 
-import logging
-
-
-logger = logging.getLogger(__name__)
-
 
 def schema_compatible(value, schema_or_field):
     """The schema_compatible function converts any value to zope.schema

src/plone.server/plone/server/metaconfigure.py

@@ -3,6 +3,8 @@
 from collections import OrderedDict
 from functools import reduce
 from pathlib import Path as osPath
+from plone.server import logger
+from plone.server import _
 from plone.server.interfaces import DEFAULT_ADD_PERMISSION
 from plone.server.interfaces import IApplication
 from plone.server.interfaces import IResourceFactory
@@ -13,23 +15,15 @@
 from zope.configuration import fields as configuration_fields
 from zope.configuration.exceptions import ConfigurationError
 from zope.configuration.fields import Path
-from zope.i18nmessageid import MessageFactory
 from zope.interface import Interface
 from zope.security.checker import defineChecker
 from zope.security.checker import getCheckerForInstancesOf
 from zope.security.checker import undefineChecker
 
 import json
-import logging
 import os
 
 
-_ = MessageFactory('plone')
-
-
-logger = logging.getLogger(__name__)
-
-
 def rec_merge(d1, d2):
     """
     Update two dicts of dicts recursively,

src/plone.server/plone/server/migrate/__init__.py

@@ -1,10 +1,7 @@
 from persistent.dict import PersistentDict
 from pkg_resources import parse_version
+from plone.server import logger
 
-import logging
-
-
-logger = logging.getLogger('plone.server')
 
 _migrations = []
 

src/plone.server/plone/server/text.py

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 """Module to define the text field."""
 from persistent import Persistent
+from plone.server import _
 from plone.server.interfaces import IRichText
 from plone.server.interfaces import IRichTextValue
 from plone.server.interfaces import ITransformer
@@ -13,14 +14,6 @@
 from zope.schema.interfaces import IFromUnicode
 from zope.schema.interfaces import WrongType
 
-import logging
-
-
-_ = MessageFactory('plone')
-
-
-LOG = logging.getLogger(__name__)
-
 
 class RawValueHolder(Persistent):
     """Place the raw value in a separate persistent object.

src/plone.server/plone/server/transactions.py

@@ -4,7 +4,7 @@
 on a single ZODB connection. This should not be possible to do safely, but
 we'll see how far we get and learn more about ZODB while doing it...
 """
-from aiohttp.web import RequestHandler
+from aiohttp.web_server import RequestHandler
 from concurrent.futures import ThreadPoolExecutor
 from plone.server.interfaces import SHARED_CONNECTION
 from transaction._manager import _new_transaction
@@ -17,16 +17,12 @@
 
 import asyncio
 import inspect
-import logging
 import threading
 import time
 import transaction
 import ZODB.Connection
 
 
-logger = logging.getLogger(__name__)
-
-
 ASYNCIO_LOCKS = {}
 
 
@@ -340,6 +336,20 @@ def tm(request):
     return request.conn.transaction_manager
 
 
+async def commit(txn, request):
+    if SHARED_CONNECTION is False:
+        await txn.acommit()
+    else:
+        await sync(request)(txn.commit)
+
+
+async def abort(txn, request):
+    if SHARED_CONNECTION is False:
+        txn.abort()
+    else:
+        await sync(request)(txn.abort)
+
+
 def sync(request):
     """Return connections asyncio executor instance (from request) to be used
     together with "await" syntax to queue or commit to be executed in