Add try/catch around nzmqt::poll

Qt and exceptions thrown in event handlers... do not mix.
MythTV · May 12, 2012 · 4c2fae0 · 4c2fae0
1 parent 051df03
commit 4c2fae0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mythtv/external/nzmqt/include/nzmqt/nzmqt.hpp b/mythtv/external/nzmqt/include/nzmqt/nzmqt.hpp
@@ -620,7 +620,11 @@ namespace nzmqt
             if (m_stopped)
                 return;
 
-            poll();
+            try {
+                poll();
+            } catch (ZMQException e) {
+		qWarning("Exception during poll: %s\n", e.what());
+            }
 
             if (!m_stopped)
                 QTimer::singleShot(m_interval, this, SLOT(run()));

diff --git a/mythtv/libs/libmythbase/loggingserver.cpp b/mythtv/libs/libmythbase/loggingserver.cpp
@@ -1282,9 +1282,10 @@ void LogForwardThread::forwardMessage(LogMessage *msg)
             item->deleteItem();
         }
     }
-    catch (...)
+    catch (nzmqt::ZMQException e)
     {
-        cout << "Exception occurred" << endl;
+        LOG(VB_GENERAL, LOG_ERR, QString("Exception during socket setup: %1")
+            .arg(e.what()));
     }