Improved connection reset and query management

Author: dankmolot

source/connection.cpp

@@ -126,21 +126,23 @@ void async_postgres::process_reset(GLua::ILuaInterface* lua,
 
     event.status = PQresetPoll(state->conn.get());
     if (event.status == PGRES_POLLING_OK) {
-        for (auto& callback : event.callbacks) {
+        auto callbacks = std::move(event.callbacks);
+        state->reset_event.reset();
+
+        for (auto& callback : callbacks) {
             callback.Push();
             lua->PushBool(true);
             pcall(lua, 1, 0);
         }
-
-        state->reset_event.reset();
     } else if (event.status == PGRES_POLLING_FAILED) {
-        for (auto& callback : event.callbacks) {
+        auto callbacks = std::move(event.callbacks);
+        state->reset_event.reset();
+
+        for (auto& callback : callbacks) {
             callback.Push();
             lua->PushBool(false);
             lua->PushString(PQerrorMessage(state->conn.get()));
             pcall(lua, 2, 0);
         }
-
-        state->reset_event.reset();
     }
 }

source/main.cpp

@@ -21,9 +21,9 @@ namespace async_postgres::lua {
                 continue;
             }
 
-            async_postgres::process_reset(lua, state);
             async_postgres::process_notifications(lua, state);
             async_postgres::process_query(lua, state);
+            async_postgres::process_reset(lua, state);
         }
 
         return 0;

source/notifications.cpp

@@ -4,11 +4,6 @@ using namespace async_postgres;
 
 void async_postgres::process_notifications(GLua::ILuaInterface* lua,
                                            Connection* state) {
-    if (state->reset_event) {
-        // don't process notifications while reconnecting
-        return;
-    }
-
     if (!state->on_notify) {
         return;
     }

source/query.cpp

@@ -26,9 +26,6 @@ void query_failed(GLua::ILuaInterface* lua, Connection* state) {
     }
 
     auto query = std::move(*state->query);
-    lua->Msg("[async_postgres] query failed: current query %d\n",
-             state->query.has_value());
-
     state->query.reset();
 
     if (query.callback) {
@@ -118,7 +115,7 @@ void process_result(GLua::ILuaInterface* lua, Connection* state,
 
 void async_postgres::process_query(GLua::ILuaInterface* lua,
                                    Connection* state) {
-    if (!state->query || state->reset_event) {
+    if (!state->query) {
         // no queries to process
         // don't process queries while reconnecting
         return;
@@ -135,10 +132,14 @@ void async_postgres::process_query(GLua::ILuaInterface* lua,
         query.flushed = PQflush(state->conn.get()) == 0;
     }
 
-    if (!poll_query(state->conn.get(), query)) {
-        query_failed(lua, state);
-        return process_query(lua, state);
-    }
+    // if (!poll_query(state->conn.get(), query)) {
+    //     query_failed(lua, state);
+    //     return process_query(lua, state);
+    // }
+
+    // probably failed poll should not result
+    // in query failure
+    poll_query(state->conn.get(), query);
 
     // ensure that getting result won't block
     if (!pg::isBusy(state->conn)) {