Merge branch 'realmaster' of pitchum/ffdn-db into master

ffdnispdb/models.py

@@ -265,29 +265,32 @@ class ISPWhoosh(object):
             'name': model.name,
             'shortname': model.shortname,
             'description': model.json.get('description'),
-            'covered_areas': ','.join(model.covered_areas_names()),
+            'covered_areas': unicode(','.join(model.covered_areas_names())),
             'step': model.json.get('progressStatus')
         }
         writer.update_document(**kw)
 
     @classmethod
     def _after_flush(cls, app, changes):
-        isp_changes = []
-        for change in changes:
-            if change[0].__class__ == ISP:
-                update = change[1] in ('update', 'insert')
-                isp_changes.append((update, change[0]))
-
-        if not len(changes):
-            return
-
-        idx = cls.get_index()
-        with idx.writer() as writer:
-            for update, model in isp_changes:
-                if update:
-                    cls.update_document(writer, model)
-                else:
-                    writer.delete_by_term(cls.primary_key, model.id)
+        try:
+            isp_changes = []
+            for change in changes:
+                if change[0].__class__ == ISP:
+                    update = change[1] in ('update', 'insert')
+                    isp_changes.append((update, change[0]))
+
+            if not len(changes):
+                return
+
+            idx = cls.get_index()
+            with idx.writer() as writer:
+                for update, model in isp_changes:
+                    if update:
+                        cls.update_document(writer, model)
+                    else:
+                        writer.delete_by_term(cls.primary_key, model.id)
+        except Exception as e:
+            print("Error while updating woosh db. Cause: {}".format(e))
 
 
 flask_sqlalchemy.models_committed.connect(ISPWhoosh._after_flush)