META-365 - Follow-up commit to add additional exception logging to as…

…sist with debugging MDS importing errors.
openmrs · Jun 15, 2019 · d80d76e · d80d76e
1 parent 115b72f
commit d80d76e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/...java/org/openmrs/module/metadatasharing/api/db/hibernate/HibernateMetadataSharingDAO.java b/...java/org/openmrs/module/metadatasharing/api/db/hibernate/HibernateMetadataSharingDAO.java
@@ -16,6 +16,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
 import org.openmrs.api.db.hibernate.DbSessionFactory;  
 import org.hibernate.criterion.Order;
@@ -35,6 +37,8 @@ public class HibernateMetadataSharingDAO implements MetadataSharingDAO {
 
 	@Autowired
 	private DbSessionFactory sessionFactory;
+
+	protected final Log log = LogFactory.getLog(getClass());
 
 	/**
 	 * @see org.openmrs.module.metadatasharing.api.db.MetadataSharingDAO#getExportedPackage(java.lang.Integer)
@@ -78,11 +82,17 @@ public List<ExportedPackage> getAllExportedPackages() {
 	 */
 	@Override
 	public ImportedItem getImportItem(Class<?> type, String uuid) {
-		Criteria criteria = sessionFactory.getCurrentSession().createCriteria(ImportedItem.class);
-		criteria.add(Restrictions.eq("uuid", uuid));
-		criteria.add(Restrictions.eq("classname", type.getName()));
-		ImportedItem result = (ImportedItem) criteria.uniqueResult();
-		return result;
+		try {
+			Criteria criteria = sessionFactory.getCurrentSession().createCriteria(ImportedItem.class);
+			criteria.add(Restrictions.eq("uuid", uuid));
+			criteria.add(Restrictions.eq("classname", type.getName()));
+			ImportedItem result = (ImportedItem) criteria.uniqueResult();
+			return result;
+		}
+		catch (RuntimeException e) {
+			log.error("Error attempting to get import item: " + type.getSimpleName() + ": " + uuid, e);
+			throw e;
+		}
 	}
 
 	/**

diff --git a/api-common/src/main/java/org/openmrs/module/metadatasharing/merger/ConvertUtil.java b/api-common/src/main/java/org/openmrs/module/metadatasharing/merger/ConvertUtil.java
@@ -15,6 +15,8 @@
 
 import java.util.Collection;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.openmrs.Concept;
 import org.openmrs.ConceptName;
 import org.openmrs.ConceptNumeric;
@@ -26,6 +28,8 @@
  *
  */
 public class ConvertUtil {
+
+	protected static final Log log = LogFactory.getLog(ConvertUtil.class);
 
 	public static void convert(Collection<ImportedItem> importedItems) {
 		for (ImportedItem importedItem : importedItems) {
@@ -59,7 +63,15 @@ public static void convert(Collection<ImportedItem> importedItems) {
 					}
 
 					Context.evictFromSession(existing);
-					Context.getConceptService().saveConcept(numeric);
+
+					try {
+						Context.getConceptService().saveConcept(numeric);
+					}
+					catch (RuntimeException e) {
+						log.error("Error saving Concept Numeric " + numeric + " (" + numeric.getUuid() + ")", e);
+						throw e;
+					}
+
 					importedItem.setExisting(numeric);
 
 					//It's slightly inefficient, but it's the easiest way to get around lazily initialization exceptions.