Merge remote-tracking branch 'origin/fix_master'

This commit is contained in:
Jack Robison 2018-09-26 15:53:48 -04:00
commit f9cba69d03
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2

View file

@ -51,7 +51,7 @@ class Manager:
def send_new_download_fail(self, download_id, name, claim_dict, e):
self._send_new_download_stats("failure", download_id, name, claim_dict, {
'name': type(e).__name__ if hasattr(type(e), "__name__") else str(type(e)),
'message': e.message,
'message': str(e),
})
def _send_new_download_stats(self, action, download_id, name, claim_dict, e=None):
@ -61,7 +61,7 @@ class Manager:
'properties': self._event_properties({
'download_id': download_id,
'name': name,
'sd_hash': None if not claim_dict else claim_dict.source_hash,
'sd_hash': None if not claim_dict else claim_dict.source_hash.decode(),
'action': action,
'error': e,
}),