From e3663c7be1d8c5a11b5e47050d921739a068b64f Mon Sep 17 00:00:00 2001 From: Boris Bobrov Date: Mon, 11 Aug 2014 20:59:35 +0400 Subject: changed the way we save information about exceptions --- mediagoblin/processing/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'mediagoblin/processing') diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index aa8f1447..112b9d35 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -325,14 +325,12 @@ def mark_entry_failed(entry_id, exc): u'fail_metadata': exc.metadata}) else: _log.warn("No idea what happened here, but it failed: %r", exc) - # Looks like no, so just mark it as failed and don't record a - # failure_error (we'll assume it wasn't handled) and don't record - # metadata (in fact overwrite it if somehow it had previous info - # here) + # Looks like no, let's record it so that admin could ask us about the + # reason atomic_update(mgg.database.MediaEntry, {'id': entry_id}, {u'state': u'failed', - u'fail_error': None, + u'fail_error': u'Unhandled exception: {0}'.format(unicode(exc)), u'fail_metadata': {}}) -- cgit v1.2.3 From a2608d6b59adc0377ad6eb6b30d596d0c9fa470c Mon Sep 17 00:00:00 2001 From: Boris Bobrov Date: Mon, 18 Aug 2014 03:07:02 +0300 Subject: changes to BaseProcessingFail arguments usage --- mediagoblin/processing/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mediagoblin/processing') diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 112b9d35..663d1bb5 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -408,8 +408,11 @@ class BaseProcessingFail(Exception): return u"%s:%s" % ( self.__class__.__module__, self.__class__.__name__) - def __init__(self, **metadata): - self.metadata = metadata or {} + def __init__(self, message=None, **metadata): + if message is not None: + super(BaseProcessingFail, self).__init__(message) + metadata['message'] = message + self.metadata = metadata class BadMediaFail(BaseProcessingFail): """ -- cgit v1.2.3 From 41076dc96bbf273c5a04978e2046ea8738b1eee0 Mon Sep 17 00:00:00 2001 From: Boris Bobrov Date: Mon, 1 Feb 2016 01:43:36 +0100 Subject: Fix occurence of unicode() Fix unicode() -> six.text_type() --- mediagoblin/processing/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mediagoblin/processing') diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 663d1bb5..29345227 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -330,7 +330,8 @@ def mark_entry_failed(entry_id, exc): atomic_update(mgg.database.MediaEntry, {'id': entry_id}, {u'state': u'failed', - u'fail_error': u'Unhandled exception: {0}'.format(unicode(exc)), + u'fail_error': u'Unhandled exception: {0}'.format( + six.text_type(exc)), u'fail_metadata': {}}) -- cgit v1.2.3