postgres: Make dut more robust against broken connections.

Author: anse1

postgres.cc

@@ -24,25 +24,25 @@ dut_pqxx::dut_pqxx(std::string conninfo)
 
 void dut_pqxx::test(const std::string &stmt)
 {
-  if (reset_gucs) {
+  try {
 
-    if(!c.is_open())
-      c.activate();
+    if (reset_gucs) {
 
-    pqxx::work w(c);
+      if(!c.is_open())
+	c.activate();
 
-    w.exec("set statement_timeout to '1s';"
-	   "set client_min_messages to 'ERROR';"
-	   "set application_name to '" PACKAGE "::dut';");
-    w.commit();
-    reset_gucs = false;
-  }
+      pqxx::work w(c);
 
-  pqxx::work w(c);
-  try {
+      w.exec("set statement_timeout to '1s';"
+	     "set client_min_messages to 'ERROR';"
+	     "set application_name to '" PACKAGE "::dut';");
+      w.commit();
+      reset_gucs = false;
+    }
+
+    pqxx::work w(c);
     w.exec(stmt.c_str());
   } catch (const pqxx::failure &e) {
-    w.abort();
     if ((dynamic_cast<const pqxx::broken_connection *>(&e))) {
       /* re-throw to outer loop to recover session. */
       reset_gucs = true;