Merge pull request #2018 from joto/fix-postproc-exception

Fix a crash when an exception is thrown in postprocessing

Author: lonvia

src/output-flex.cpp

@@ -1076,8 +1076,22 @@ void output_flex_t::stop()
 
 void output_flex_t::wait()
 {
+    std::exception_ptr eptr;
+    flex_table_t const *table_with_error = nullptr;
+
     for (auto &table : m_table_connections) {
-        table.task_wait();
+        try {
+            table.task_wait();
+        } catch (...) {
+            eptr = std::current_exception();
+            table_with_error = &table.table();
+        }
+    }
+
+    if (eptr) {
+        log_error("Error while doing postprocessing on table '{}':",
+                  table_with_error->name());
+        std::rethrow_exception(eptr);
     }
 }
 

src/output-pgsql.cpp

@@ -159,8 +159,16 @@ void output_pgsql_t::stop()
 
 void output_pgsql_t::wait()
 {
+    std::exception_ptr eptr;
     for (auto &t : m_tables) {
-        t->task_wait();
+        try {
+            t->task_wait();
+        } catch (...) {
+            eptr = std::current_exception();
+        }
+    }
+    if (eptr) {
+        std::rethrow_exception(eptr);
     }
 }