0001-cmis-ignore-cmislib-logs-56881.patch

Benjamin Dauvergne, 11 septembre 2021 12:42

Voir les différences: en ligne côte à côte

Subject: [PATCH] cmis: ignore cmislib logs (#56881)

 passerelle/apps/cmis/models.py | 32 ++++++++++++++++++--------------
 passerelle/apps/cmis/views.py  |  9 +++++----
 passerelle/utils/logging.py    | 34 ++++++++++++++++++++++++++++++++++
 tests/test_cmis.py             |  5 ++++-
 4 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 passerelle/utils/logging.py

     import binascii
     import functools
     import re
     from contextlib import contextmanager
     import httplib2
     from cmislib import CmisClient
-...
     from passerelle.base.models import BaseResource
     from passerelle.utils.api import endpoint
     from passerelle.utils.jsonresponse import APIError
     from passerelle.utils.logging import ignore_loggers
     SPECIAL_CHARS = '!#$%&+-^_`~;[]{}+=~'
     FILE_PATH_PATTERN = r'^(/|(/[\w%s]+)+)$' % re.escape(SPECIAL_CHARS)
-...
             verbose_name = _('CMIS connector')
         def check_status(self):
             cmis_gateway = self.get_cmis_gateway()
             cmis_gateway.repo
             with self.get_cmis_gateway() as cmis_gateway:
                 cmis_gateway.repo
         @endpoint(
             description=_('File upload'),
-...
                 raise APIError(error_msg, http_status=400)
             filename = data.get('filename') or data['file']['filename']
             self.logger.info("received file_name: '%s', file_path: '%s'", filename, data["path"])
             cmis_gateway = self.get_cmis_gateway()
             doc = cmis_gateway.create_doc(
                 filename,
                 data['path'],
                 data['file_byte_content'],
                 content_type=data['file'].get('content_type'),
                 object_type=data.get('object_type'),
                 properties=data.get('properties'),
+            )
             return {'data': {'properties': doc.properties}}
             with self.get_cmis_gateway() as cmis_gateway:
                 doc = cmis_gateway.create_doc(
                     filename,
                     data['path'],
                     data['file_byte_content'],
                     content_type=data['file'].get('content_type'),
                     object_type=data.get('object_type'),
                     properties=data.get('properties'),
+                )
                 return {'data': {'properties': doc.properties}}
         @contextmanager
         def get_cmis_gateway(self):
             return CMISGateway(self.cmis_endpoint, self.username, self.password, self.logger)
             with ignore_loggers('cmislib'):
                 yield CMISGateway(self.cmis_endpoint, self.username, self.password, self.logger)
         def _validate_inputs(self, data):
             """process dict

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from cmislib import CmisClient
     from cmislib.exceptions import ObjectNotFoundException
     from django.http import Http404
     from django.utils.translation import ugettext_lazy as _
-...
         model = CmisConnector
         template_name = 'cmis/cmis_type.html'
         def get(self, request, *args, **kwargs):
         def dispatch(self, request, *args, **kwargs):
             self.connector = CmisConnector.objects.get(slug=kwargs['connector_slug'])
             self.cmis_gateway = self.connector.get_cmis_gateway()
             with self.connector.get_cmis_gateway() as cmis_gateway:
                 self.cmis_gateway = cmis_gateway
                 return super().dispatch(request, *args, **kwargs)
         def get(self, request, *args, **kwargs):
             type_id = request.GET.get('id')
             if type_id:
                 try:
-...
                     raise Http404(_('Cmis type not found.'))
             else:
                 self.current_type = None
             return super(CmisTypeView, self).get(request, *args, **kwargs)
         def get_context_data(self, **kwargs):

     # passerelle - uniform access to multiple data sources and services
     # Copyright (C) 2021 Entr'ouvert
+    #
     # This program is free software: you can redistribute it and/or modify it
     # under the terms of the GNU Affero General Public License as published
     # by the Free Software Foundation, either version 3 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import logging
     from contextlib import contextmanager
     @contextmanager
     def ignore_loggers(*loggers_names):
         propagate = {}
         for logger_name in loggers_names:
             logger = logging.getLogger(logger_name)
             propagate[logger] = logger.propagate
             logger.propagate = False
         yield
         for logger_name in loggers_names:
             logger = logging.getLogger(logger_name)
             logger.propagate = propagate[logger]

     @pytest.mark.parametrize('debug', (False, True))
     @mock.patch('httplib2.Http.request')
     def test_raw_uploadfile(mocked_request, app, setup, debug):
     def test_raw_uploadfile(mocked_request, app, setup, debug, caplog):
         """ Simulate the bellow bash query :
         $ http https://passerelle.dev.publik.love/cmis/ged/uploadfile \
                file:='{"filename": "test2", "content": "c2FsdXQK"}' path=/test-eo
         """
         caplog.set_level('DEBUG')
         file_name = "test2"
         file_content = 'salut\n'
         path = "/test-eo"
-...
             assert logs[9].message == 'cmislib POST response (200)'
             assert logs[9].extra['response'].startswith('<?xml')
         assert not any('cmislib' in record.name for record in caplog.records)
     def test_cmis_check_status(app, setup, monkeypatch):
         cmis_gateway = Mock()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-cmis-ignore-cmislib-logs-56881.patch