From 2e73e828e8226976bb1942dbfc42e86ae0584563 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Feb 02 2018 12:26:31 +0000
Subject: Handle exceptions while sending messages to bus and also when calling db.session.rollback.


---

diff --git a/server/odcs/server/backend.py b/server/odcs/server/backend.py
index fcf35af..b8f4340 100644
--- a/server/odcs/server/backend.py
+++ b/server/odcs/server/backend.py
@@ -75,7 +75,10 @@ class BackendThread(object):
                 self.do_work()
             except Exception:
                 log.exception("Exception in backend thread")
-                db.session.rollback()
+                try:
+                    db.session.rollback()
+                except Exception:
+                    log.exception("Cannot rollback DB session")
 
             # If the self.stop has been called from the do_work, break earlier
             # so we don't wait on exit_cond.
diff --git a/server/odcs/server/events.py b/server/odcs/server/events.py
index bedd309..835e442 100644
--- a/server/odcs/server/events.py
+++ b/server/odcs/server/events.py
@@ -63,5 +63,8 @@ def start_to_publish_messages(session):
         } for compose in _cached_composes]
         log.debug('Sending messages: %s', msgs)
         if msgs:
-            messaging.publish(msgs)
+            try:
+                messaging.publish(msgs)
+            except Exception:
+                log.exception("Cannot publish message to bus.")
         del _cached_composes[:]