Projet

Général

Profil

0002-general-remove-tracing-logs-61292.patch

Frédéric Péters, 01 février 2022 16:28

Télécharger (10,9 ko)

Voir les différences:

Subject: [PATCH 2/8] general: remove tracing logs (#61292)

 wcs/admin/forms.py           |  6 +-----
 wcs/admin/workflows.py       |  7 +------
 wcs/backoffice/management.py |  6 +-----
 wcs/forms/common.py          |  9 +--------
 wcs/forms/root.py            | 10 +---------
 wcs/root.py                  |  6 +-----
 6 files changed, 6 insertions(+), 38 deletions(-)
wcs/admin/forms.py
29 29
from wcs.categories import Category
30 30
from wcs.formdef import DRAFTS_DEFAULT_LIFESPAN, FormDef, FormdefImportError, FormdefImportRecoverableError
31 31
from wcs.forms.root import qrcode
32
from wcs.qommon import _, force_str, get_logger, misc, template
32
from wcs.qommon import _, force_str, misc, template
33 33
from wcs.qommon.afterjobs import AfterJob
34 34
from wcs.qommon.backoffice.menu import html_top
35 35
from wcs.qommon.errors import AccessForbiddenError, TraversalError
......
1121 1121
            return self.workflow_status_remapping_submit(form, new_workflow)
1122 1122

  
1123 1123
    def workflow_status_remapping_submit(self, form, new_workflow):
1124
        get_logger().info(
1125
            'admin - form "%s", workflow is now "%s" (was "%s")'
1126
            % (self.formdef.name, new_workflow.name, self.formdef.workflow.name)
1127
        )
1128 1124
        status_mapping = {}
1129 1125
        for status in self.formdef.workflow.possible_status:
1130 1126
            status_mapping[status.id] = form.get_widget('mapping-%s' % status.id).parse()
wcs/admin/workflows.py
32 32
from wcs.categories import WorkflowCategory
33 33
from wcs.formdata import Evolution
34 34
from wcs.formdef import FormDef
35
from wcs.qommon import _, errors, force_str, get_logger, misc, template
35
from wcs.qommon import _, errors, force_str, misc, template
36 36
from wcs.qommon.admin.menu import command_icon
37 37
from wcs.qommon.backoffice.menu import html_top
38 38
from wcs.qommon.form import (
......
796 796
                            modified = True
797 797
                    if modified:
798 798
                        item.store()
799
        if action == 'remove':
800
            get_logger().info(
801
                'admin - delete status "%s" in workflow "%s": %d forms deleted'
802
                % (self.status.name, self.workflow.name, nb_forms)
803
            )
804 799

  
805 800
    def display(self):
806 801
        form = Form(enctype='multipart/form-data')
wcs/backoffice/management.py
45 45
from wcs.variables import LazyFieldVar
46 46
from wcs.workflows import ActionsTracingEvolutionPart, WorkflowStatusItem, item_classes, template_on_formdata
47 47

  
48
from ..qommon import _, errors, ezt, force_str, get_cfg, get_logger, misc, ngettext, ods
48
from ..qommon import _, errors, ezt, force_str, get_cfg, misc, ngettext, ods
49 49
from ..qommon.afterjobs import AfterJob
50 50
from ..qommon.backoffice.listing import pagination_links
51 51
from ..qommon.backoffice.menu import html_top
......
1863 1863
    def _q_index(self):
1864 1864
        self.view_type = 'table'
1865 1865
        self.check_access()
1866
        get_logger().info('backoffice - form %s - listing' % self.formdef.name)
1867 1866

  
1868 1867
        if 'job' in get_request().form:
1869 1868
            return self.job_multi()
......
2041 2040
        order_by = misc.get_order_by_or_400(get_request().form.get('order_by', None))
2042 2041
        skip_header_line = bool(get_request().form.get('skip_header_line'))
2043 2042

  
2044
        get_logger().info('backoffice - form %s - listing csv' % self.formdef.name)
2045

  
2046 2043
        count = self.formdef.data_class().count()
2047 2044
        job = CsvExportAfterJob(
2048 2045
            self.formdef,
......
2354 2351
            'statistics', get_request().user
2355 2352
        ):
2356 2353
            raise errors.AccessForbiddenError()
2357
        get_logger().info('backoffice - form %s - stats' % self.formdef.name)
2358 2354
        html_top('management', '%s - %s' % (_('Form'), self.formdef.name))
2359 2355
        r = TemplateIO(html=True)
2360 2356
        get_response().breadcrumb.append(('stats', _('Statistics')))
wcs/forms/common.py
30 30
from wcs.qommon.admin.texts import TextsDirectory
31 31
from wcs.workflows import EditableWorkflowStatusItem, RedisplayFormException
32 32

  
33
from ..qommon import _, errors, get_logger, misc, template
33
from ..qommon import _, errors, misc, template
34 34

  
35 35

  
36 36
class FileDirectory(Directory):
......
254 254
                return redirect(self.filled.get_url(backoffice=True))
255 255

  
256 256
        get_request().view_name = 'status'
257
        get_logger().info('form %s - id: %s - view' % (self.formdef.name, self.filled.id))
258 257

  
259 258
        user = get_request().user
260 259
        form = self.get_workflow_form(user)
......
577 576
                get_session().unmark_visited_object(self.filled)
578 577
                return response
579 578

  
580
        get_logger().info('form %s - id: %s - view status' % (self.formdef.name, self.filled.id))
581 579
        get_response().add_javascript(['jquery.js', 'qommon.forms.js'])
582 580
        self.html_top('%s - %s' % (self.formdef.name, self.filled.id))
583 581
        r = TemplateIO(html=True)
......
656 654
        return r.getvalue()
657 655

  
658 656
    def submit(self, form):
659
        current_status = self.filled.status
660 657
        user = get_request().user
661 658
        next_url = self.filled.handle_workflow_form(user, form)
662 659
        if next_url:
663 660
            return next_url
664 661
        if form.has_errors():
665 662
            return
666
        if current_status != self.filled.status:
667
            get_logger().info(
668
                'form %s - id: %s - status -> %s' % (self.formdef.name, self.filled.id, self.filled.status)
669
            )
670 663
        try:
671 664
            self.check_auth()
672 665
        except errors.AccessError:
wcs/forms/root.py
45 45
from wcs.variables import LazyFormDef
46 46
from wcs.workflows import Workflow, WorkflowBackofficeFieldsFormDef, WorkflowStatusItem
47 47

  
48
from ..qommon import _, emails, errors, get_cfg, get_logger, misc, template
48
from ..qommon import _, emails, errors, get_cfg, misc, template
49 49
from ..qommon.admin.emails import EmailsDirectory
50 50
from ..qommon.form import CheckboxWidget, EmailWidget, Form, HiddenErrorWidget, HtmlWidget, StringWidget
51 51
from ..qommon.template import TemplateError
......
288 288
        return 0
289 289

  
290 290
    def step(self, step_no, current_page):
291
        get_logger().info('form %s - step %s' % (self.formdef.name, step_no))
292

  
293 291
        page_labels = []
294 292
        current_position = 1
295 293

  
......
1015 1013
            return self.page(self.pages[0])
1016 1014

  
1017 1015
        if form.get_submit() == 'cancel':
1018
            get_logger().info('form %s - cancel' % (self.formdef.name))
1019 1016
            if self.edit_mode:
1020 1017
                return redirect('.')
1021 1018
            magictoken = form.get_widget('magictoken').parse()
......
1139 1136
            if get_request().form.get('f00'):  # 🍯
1140 1137
                form.add(HiddenErrorWidget, 'honeypot')
1141 1138
                form.set_error('honeypot', 'error')
1142
                get_logger().info('form %s - honeypot was touched' % self.formdef.name)
1143 1139
                page_error_messages.append(_('Honey pot should be left untouched.'))
1144 1140

  
1145 1141
            # form.get_submit() returns the name of the clicked button, and
......
1451 1447
            get_session().store()
1452 1448
        self.set_tracking_code(filled, data)
1453 1449

  
1454
        get_logger().info('form %s - saving draft (id: %s)' % (self.formdef.name, filled.id))
1455

  
1456 1450
        return filled
1457 1451

  
1458 1452
    def get_current_draft(self):
......
1534 1528
        self.set_tracking_code(filled)
1535 1529
        session.remove_magictoken(get_request().form.get('magictoken'))
1536 1530

  
1537
        get_logger().info('form %s - done (id: %s)' % (self.formdef.name, filled.id))
1538 1531
        url = None
1539 1532
        if existing_formdata is None:
1540 1533
            self.clean_submission_context()
......
1797 1790
        user = request.user
1798 1791

  
1799 1792
        if not self.category:
1800
            get_logger().info('home page')
1801 1793
            if user:
1802 1794
                message = TextsDirectory.get_html_text('welcome-logged')
1803 1795
            else:
wcs/root.py
33 33
from .forms.actions import ActionsDirectory
34 34
from .forms.preview import PreviewDirectory
35 35
from .myspace import MyspaceDirectory
36
from .qommon import _, errors, get_cfg, get_logger, ident, misc, saml2, template
36
from .qommon import _, errors, get_cfg, ident, misc, saml2, template
37 37
from .qommon.afterjobs import AfterJobStatusDirectory
38 38
from .qommon.form import Form, RadiobuttonsWidget
39 39
from .qommon.pages import PagesDirectory
......
60 60
    _q_exports = ['']
61 61

  
62 62
    def _q_index(self):
63
        get_logger().info('login')
64 63
        ident_methods = get_cfg('identification', {}).get('methods', [])
65 64

  
66 65
        if get_request().form.get('ReturnUrl'):
67 66
            get_request().form['next'] = get_request().form.pop('ReturnUrl')
68 67

  
69 68
        if len(ident_methods) == 0:
70
            get_logger().info('no ident method defined')
71 69
            idps = get_cfg('idp', {})
72 70
            if len(idps) == 0:
73 71
                return template.error_page(_('Authentication subsystem is not yet configured.'))
......
136 134
    _q_exports = ['']
137 135

  
138 136
    def _q_index(self):
139
        get_logger().info('register')
140 137
        ident_methods = get_cfg('identification', {}).get('methods', [])
141 138

  
142 139
        if len(ident_methods) == 0:
......
281 278
        return root.auth(get_publisher().get_root_url())
282 279

  
283 280
    def logout(self):
284
        get_logger().info('logout')
285 281
        session = get_session()
286 282
        if not session:
287 283
            return redirect(get_publisher().get_root_url())
288
-