From 674999874136714be031db8c31432eb2a4d50c2e Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 7 Feb 2017 14:43:11 -0200 Subject: [#952] Access log_format key correctly even if it's None This is the case of the infamous 'Unhandled error in Deferred' events that were not logging the traceback. --- service/pixelated/config/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/logger.py b/service/pixelated/config/logger.py index a1e825a6..c4d2dc76 100644 --- a/service/pixelated/config/logger.py +++ b/service/pixelated/config/logger.py @@ -44,9 +44,9 @@ def init(debug=False): def formatter(event): event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) event['log_level'] = event['log_level'].name.upper() + event['log_format'] = event.get('log_format') or '' logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + '\n' return logstring.format(**event) observers = [FileLogObserver(sys.stdout, formatter)] - globalLogBeginner.beginLoggingTo(observers) -- cgit v1.2.3 From d4ef82a55053a0a672935104dda2a06eae8579ac Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 7 Feb 2017 14:52:43 -0200 Subject: [#952] Log events even when formatting errors occur --- service/pixelated/config/logger.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/logger.py b/service/pixelated/config/logger.py index c4d2dc76..6a4b76d0 100644 --- a/service/pixelated/config/logger.py +++ b/service/pixelated/config/logger.py @@ -42,11 +42,14 @@ def init(debug=False): logging.getLogger('gnupg').addFilter(PrivateKeyFilter()) def formatter(event): - event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) - event['log_level'] = event['log_level'].name.upper() - event['log_format'] = event.get('log_format') or '' - logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + '\n' - return logstring.format(**event) + try: + event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) + event['log_level'] = event['log_level'].name.upper() + event['log_format'] = event.get('log_format') or '' + logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + '\n' + return logstring.format(**event) + except Exception as e: + return "Error while formatting log event: {!r}\nOriginal event: {!r}\n".format(e, event) observers = [FileLogObserver(sys.stdout, formatter)] globalLogBeginner.beginLoggingTo(observers) -- cgit v1.2.3 From 2b8268f24dad481bf5274664b8699582f116d83d Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 7 Feb 2017 15:09:19 -0200 Subject: [#952] Get rid of extra empty line on unhandled errors --- service/pixelated/config/logger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/logger.py b/service/pixelated/config/logger.py index 6a4b76d0..bc4ab8d4 100644 --- a/service/pixelated/config/logger.py +++ b/service/pixelated/config/logger.py @@ -45,8 +45,8 @@ def init(debug=False): try: event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) event['log_level'] = event['log_level'].name.upper() - event['log_format'] = event.get('log_format') or '' - logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + '\n' + event['log_format'] = str(event['log_format']) + '\n' if event.get('log_format') else '' + logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] return logstring.format(**event) except Exception as e: return "Error while formatting log event: {!r}\nOriginal event: {!r}\n".format(e, event) -- cgit v1.2.3 From 9c6e2a7f40f3e96b203e1528ab974286e27a8d32 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 18 Jan 2017 14:14:15 -0200 Subject: Revert "Revert "[#888] Fix soledad class contract to be compatible with new merge. with @thaissiqueira."" This reverts commit 1e6e165a3fc397e45884eaec1122ba0cc5ff923e. --- service/pixelated/config/sessions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index eb233a9f..594b8e35 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -95,8 +95,7 @@ class LeapSessionFactory(object): server_url=server_url, cert_file=api_cert, shared_db=None, - auth_token=user_token, - defer_encryption=False) + auth_token=user_token) defer.returnValue(soledad) except (WrongMacError, UnknownMacMethodError), e: raise SoledadWrongPassphraseException(e) -- cgit v1.2.3