From c15fae3564c72fd8d6d729a97dc969992d4a5eca Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Thu, 28 May 2020 14:20:28 -0400
Subject: [PATCH] Log what thing we failed to import.
This should help more quickly narrow down where things are failing on an import.
---
.../xmodule/modulestore/xml_importer.py | 44 +++++++++++--------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 9e6fdf047de..ee7864e9d39 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -460,15 +460,19 @@ class ImportManager(object):
if self.verbose:
log.debug('importing module location %s', child.location)
- _update_and_import_module(
- child,
- self.store,
- self.user_id,
- courselike_key,
- dest_id,
- do_import_static=self.do_import_static,
- runtime=courselike.runtime,
- )
+ try:
+ _update_and_import_module(
+ child,
+ self.store,
+ self.user_id,
+ courselike_key,
+ dest_id,
+ do_import_static=self.do_import_static,
+ runtime=courselike.runtime,
+ )
+ except Exception:
+ log.error('failed to import module location %s', child.location)
+ raise
depth_first(child)
@@ -478,15 +482,19 @@ class ImportManager(object):
if self.verbose:
log.debug('importing module location %s', leftover)
- _update_and_import_module(
- self.xml_module_store.get_item(leftover),
- self.store,
- self.user_id,
- courselike_key,
- dest_id,
- do_import_static=self.do_import_static,
- runtime=courselike.runtime,
- )
+ try:
+ _update_and_import_module(
+ self.xml_module_store.get_item(leftover),
+ self.store,
+ self.user_id,
+ courselike_key,
+ dest_id,
+ do_import_static=self.do_import_static,
+ runtime=courselike.runtime,
+ )
+ except Exception:
+ log.error('failed to import module location %s', leftover)
+ raise
def run_imports(self):
"""
--
GitLab