0001-logging-manage-log_retention_days-log-parameters-474.patch

Nicolas Roche, 22 octobre 2020 14:19

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

Subject: [PATCH] logging: manage log_retention_days log parameters (#47426)

 ...23_loggingparameters_log_retention_days.py | 20 ++++++++++++++++++
 passerelle/base/models.py                     |  8 ++++++-
 passerelle/base/views.py                      |  5 ++++-
 tests/test_misc.py                            | 21 ++++++++++++++++++-
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 passerelle/base/migrations/0023_loggingparameters_log_retention_days.py

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.18 on 2020-10-22 10:00
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('base', '0022_auto_20200715_1033'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='loggingparameters',
                 name='log_retention_days',
                 field=models.PositiveIntegerField(default=7, help_text='Number of days to keep logs', verbose_name='Log retention days'),
             ),
+        ]

                                     '%s is unsupported' % (field, cls))
             instance.save()
             if 'log_level' in d:
                 instance.set_log_level(d['log_level'])
             return instance
         def clean_logs(self):
             # clean logs
             timestamp = timezone.now() - datetime.timedelta(days=settings.LOG_RETENTION_DAYS)
             timestamp = timezone.now() - datetime.timedelta(
                 days=self.logging_parameters.log_retention_days)
             ResourceLog.objects.filter(
                     appname=self.get_connector_slug(),
                     slug=self.slug,
                     timestamp__lt=timestamp).delete()
         def check_status(self):
             # should raise an exception if status is not ok
             raise NotImplementedError
-...
             help_text=_('Maximum HTTP request size to log'),
             default=settings.LOGGED_REQUESTS_MAX_SIZE
+        )
         responses_max_size = models.PositiveIntegerField(
             verbose_name=_('Responses maximum size'),
             help_text=_('Maximum HTTP reponse size to log'),
             default=settings.LOGGED_RESPONSES_MAX_SIZE
+        )
         log_retention_days = models.PositiveIntegerField(
             verbose_name=_('Log retention days'),
             help_text=_('Number of days to keep logs'),
             default=settings.LOG_RETENTION_DAYS
+        )
         class Meta:
             unique_together = (('resource_type', 'resource_pk'))
     def parse_notification_delays(value):
         delays = [int(v.strip()) for v in value.split(',')]
         if not all(delay >= 0 for delay in delays):

         def get_context_data(self, **kwargs):
             context = super(LoggingParametersUpdateView, self).get_context_data(**kwargs)
             context['connector'] = self.get_resource()
             return context
         def get_form_class(self):
             form_class = model_forms.modelform_factory(
                 LoggingParameters,
                 fields=['log_level', 'trace_emails', 'requests_max_size', 'responses_max_size'])
                 fields=['log_level', 'trace_emails', 'requests_max_size', 'responses_max_size',
                         'log_retention_days'])
             form_class.base_fields['trace_emails'].widget.attrs['rows'] = '3'
             return form_class
         def get_initial(self):
             d = self.initial.copy()
             d['resource_type'] = self.kwargs['resource_type']
             d['resource_pk'] = self.kwargs['resource_pk']
             parameters = self.get_resource().logging_parameters
             d['log_level'] = parameters.log_level
             d['trace_emails'] = parameters.trace_emails
             d['requests_max_size'] = parameters.requests_max_size
             d['responses_max_size'] = parameters.responses_max_size
             d['log_retention_days'] = parameters.log_retention_days
             return d
         def get_resource(self):
             content_type = ContentType.objects.get_for_id(self.kwargs['resource_type'])
             return content_type.model_class().objects.get(pk=self.kwargs['resource_pk'])
         def get_success_url(self):
             return self.get_resource().get_absolute_url()
         def form_valid(self, form):
             parameters = self.get_resource().logging_parameters
             parameters.log_level = form.cleaned_data['log_level']
             parameters.trace_emails = form.cleaned_data['trace_emails']
             parameters.requests_max_size = form.cleaned_data['requests_max_size']
             parameters.responses_max_size = form.cleaned_data['responses_max_size']
             parameters.log_retention_days = form.cleaned_data['log_retention_days']
             parameters.save()
             return super(LoggingParametersUpdateView, self).form_valid(form)
     class ManageAvailabilityView(UpdateView):
         template_name = 'passerelle/manage/manage_availability_form.html'
         form_class = AvailabilityParametersForm

     import datetime
     import pytest
     from mock import patch
     from django.contrib.contenttypes.models import ContentType
     from django.core.files import File
     from django.db import connection
     from django.db.migrations.executor import MigrationExecutor
     from django.core.urlresolvers import reverse
     from django.utils import timezone
     from django.utils.six import StringIO
     from passerelle.base.models import ResourceLog
     from passerelle.apps.opengis.models import OpenGIS
     from passerelle.apps.clicrdv.models import ClicRdv
     from test_manager import login, admin_user
     def test_get_description_url_fields(db):
         connector = OpenGIS(slug='plop', wms_service_url='http://www.example.net')
         assert 'http://www.example.net' in [x[1] for x in connector.get_description_fields()]
         connector = OpenGIS(slug='plop', wms_service_url='http://username:secret@www.example.net')
         assert 'http://***:***@www.example.net' in [x[1] for x in connector.get_description_fields()]
-...
     def test_get_description_secret_fields(db):
         connector = ClicRdv(slug='plop', apikey='secret1', username='plop', password='secret2')
         assert not 'secret1' in [x[1] for x in connector.get_description_fields()]
         assert not 'secret2' in [x[1] for x in connector.get_description_fields()]
     def test_log_cleaning(db):
     def test_log_cleaning(app, db, admin_user, settings):
         ResourceLog.objects.all().delete()
         connector = OpenGIS(slug='plop', wms_service_url='http://www.example.net')
         connector.save()
         connector.logger.error('hello1')
         connector.logger.error('hello2')
         assert ResourceLog.objects.all().count() == 2
         ResourceLog.objects.update(timestamp=timezone.now() - datetime.timedelta(days=10))
         connector.logger.error('hello3')
         assert ResourceLog.objects.all().count() == 3
         url = reverse('logging-parameters', kwargs={
             'resource_type': ContentType.objects.get_for_model(connector).id,
             'resource_pk': connector.id})
         app = login(app)
         resp = app.get(url)
         assert int(resp.html.find('input', {'name': 'log_retention_days'})['value']) == \
             settings.LOG_RETENTION_DAYS
         resp.form['log_retention_days'] = '11'
         resp.form.submit()
         connector.daily()
         assert ResourceLog.objects.all().count() == 3
         resp.form['log_retention_days'] = '10'
         resp.form.submit()
         connector.daily()
         assert ResourceLog.objects.all().count() == 1
     @pytest.fixture
     def email_handler():
         import logging
         from django.utils.log import AdminEmailHandler
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-logging-manage-log_retention_days-log-parameters-474.patch