From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Fri, 20 Nov 2015 08:32:38 +0000 (+0100)
Subject: fix recovery of postgres connection
X-Git-Tag: v5.3.0~50
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=79db26bc13a3eed3104658c4ce5b174557275909;p=brisk.git

fix recovery of postgres connection
---

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index f4202c6..7cd0c4b 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -62,8 +62,9 @@ class DBConn
     static function destroy()
     {
         if (DBConn::$dbcnnx != FALSE) {
+            $ret = pg_close(DBConn::$dbcnnx);
             DBConn::$dbcnnx = FALSE;
-            return (pg_close(DBConn::$dbcnnx));
+            return ($ret);
         }
         return TRUE;
     }
@@ -112,11 +113,13 @@ class BriskDB
 
     function query($sql)
     {
-        if (($res = pg_query($this->dbconn->db(), $sql)) == FALSE) {
+        if (($res = @pg_query($this->dbconn->db(), $sql)) == FALSE) {
+            error_log('pg_result_status: ' .  pg_result_status($res));
+            error_log('pg_connection_status: ' .  pg_connection_status($this->dbconn->db()));
             // try to recover the connection
             if (($this->dbconn = DBConn::recover()) == FALSE)
                 return FALSE;
-            return (pg_query($this->dbconn->db(), $sql));
+            return (@pg_query($this->dbconn->db(), $sql));
         }
 
         return ($res);