0003-logger-remove-user-session-tracing-support-61292.patch
| wcs/qommon/logger.py | ||
|---|---|---|
| 17 | 17 |
import logging |
| 18 | 18 |
import os |
| 19 | 19 | |
| 20 |
from quixote import get_publisher, get_request, get_session
|
|
| 20 |
from quixote import get_publisher, get_request |
|
| 21 | 21 |
from quixote.logger import DefaultLogger |
| 22 | 22 | |
| 23 | 23 | |
| ... | ... | |
| 73 | 73 |
if request: |
| 74 | 74 |
record.address = request.get_environ('REMOTE_ADDR', '-')
|
| 75 | 75 |
record.path = request.get_path() |
| 76 | ||
| 77 |
user = request.user |
|
| 78 |
if user: |
|
| 79 |
if isinstance(user, (str, int)): |
|
| 80 |
user_id = user |
|
| 81 |
else: |
|
| 82 |
user_id = user.id |
|
| 83 |
if isinstance(user_id, str) and user_id.startswith('anonymous-'):
|
|
| 84 |
# legacy; kept for ancient log entries |
|
| 85 |
user_id = 'anonymous' |
|
| 86 |
else: |
|
| 87 |
user_id = 'unlogged' |
|
| 88 |
if BotFilter.is_bot(): |
|
| 89 |
user_id = 'bot' |
|
| 90 |
record.user_id = user_id |
|
| 91 | 76 |
else: |
| 92 | 77 |
record.address = '-' |
| 93 | 78 |
record.path = '-' |
| 94 |
record.user_id = 'unlogged' |
|
| 95 |
record.session_id = ( |
|
| 96 |
get_request() and get_session() and get_session().get_session_id() |
|
| 97 |
) or '[nosession]' |
|
| 98 | 79 | |
| 99 | 80 |
return logging.Formatter.format(self, record).replace('\n', '\n ')
|
| wcs/qommon/publisher.py | ||
|---|---|---|
| 777 | 777 |
return self._app_logger |
| 778 | 778 | |
| 779 | 779 |
self._app_logger = logging.getLogger(self.APP_NAME + self.app_dir) |
| 780 |
if not self._app_logger.filters: |
|
| 781 |
self._app_logger.addFilter(logger.BotFilter()) |
|
| 782 | 780 |
logfile = self.get_app_logger_filename() |
| 783 | 781 | |
| 784 | 782 |
if not self._app_logger.handlers: |
| 785 | 783 |
hdlr = logging.handlers.RotatingFileHandler(logfile, 'a', 2 ** 20, 100) |
| 786 | 784 |
# max size = 1M |
| 787 |
formatter = logger.Formatter( |
|
| 788 |
'%(asctime)s %(levelname)s %(address)s ' '%(session_id)s %(path)s %(user_id)s - %(message)s' |
|
| 789 |
) |
|
| 785 |
formatter = logger.Formatter('%(asctime)s %(levelname)s %(address)s %(path)s - %(message)s')
|
|
| 790 | 786 |
hdlr.setFormatter(formatter) |
| 791 | 787 |
self._app_logger.addHandler(hdlr) |
| 792 | 788 |
if debug: |
| 793 |
- |
|