From b7295382e7589a108a329e6bee80acc23080c978 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 5 Jun 2018 20:52:03 +0200
Subject: [PATCH] Fix #274: Broken logging statement during import error
---
api/funkwhale_api/music/tasks.py | 4 +++-
changes/changelog.d/274.bugfix | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 changes/changelog.d/274.bugfix
diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
index 218e374e8..7b1b48981 100644
--- a/api/funkwhale_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -259,7 +259,9 @@ def get_cover_from_fs(dir_path):
'import_job')
def import_job_run(self, import_job, replace=False, use_acoustid=False):
def mark_errored(exc):
- logger.error('[Import Job %s] Error during import: %s', str(exc))
+ logger.error(
+ '[Import Job %s] Error during import: %s',
+ import_job.pk, str(exc))
import_job.status = 'errored'
import_job.save(update_fields=['status'])
diff --git a/changes/changelog.d/274.bugfix b/changes/changelog.d/274.bugfix
new file mode 100644
index 000000000..c4c5a3aec
--- /dev/null
+++ b/changes/changelog.d/274.bugfix
@@ -0,0 +1 @@
+Broken logging statement during import error (#274)
--
GitLab