✨ Improve MySQL reconnect logic and remove stale connection caching 🔧

- Remove connectionMaster singleton that could return stale database connections
- Refactor reconnect() to properly reset counter on success and only increment on failure
- Remove implicit reconnect on forked processes (php-resque) to avoid unintended reconnections
- Add explicit error handling for reconnection failures by catching and re-throwing exceptions
- Close cursor after SELECT 1 health check to free up resources

Author: remdex

lhc_web/ezcomponents/Database/src/handlers/mysql.php

@@ -124,22 +124,18 @@ public function __construct( $dbParams )
     public function reconnect()
     {
         try {
-            @$this->query('SELECT 1');
+            $this->query('SELECT 1')->closeCursor();
         } catch (Exception $e) {
             if ($e->errorInfo[1] == 2006 && $this->reconnectedCounter < 5) {
-                $this->reconnectedCounter++;
-                $this->reconnectClean();
+                try {
+                    $this->reconnectClean();
+                    $this->reconnectedCounter = 0;
+                } catch (Exception $eReconnect) {
+                    $this->reconnectedCounter++;
+                    throw $eReconnect;
+                }
             }
         }
-
-        // After a fork (php-resque workers), PDO may report an active
-        // transaction on the inherited connection even though ezc's
-        // $transactionNestingLevel was reset to 0 in the child. Force
-        // a fresh connection to clear the stale PDO state.
-        if ($this->inTransaction()) {
-            $this->reconnectedCounter++;
-            $this->reconnectClean();
-        }
     }
 
     private function reconnectClean()

lhc_web/lib/core/lhcore/lhdb.php

@@ -2,7 +2,6 @@
 
 class erLhcoreClassLazyDatabaseConfiguration implements ezcBaseConfigurationInitializer
 {
-     private static $connectionMaster;
      public static $connectionTime = null;
      public static $connectionStartTime = null;
 
@@ -33,7 +32,6 @@ public static function configureObject( $instance )
                      return $db;
                  } else {
                      // Perhaps connection is already done with master?
-                     if (isset(self::$connectionMaster)) return self::$connectionMaster;
                      try {
                         $db = ezcDbFactory::create( "mysql://{$cfg->getSetting( 'db', 'user' )}:{$cfg->getSetting( 'db', 'password' )}@{$cfg->getSetting( 'db', 'host' )}:{$cfg->getSetting( 'db', 'port' )}/{$cfg->getSetting( 'db', 'database' )}" );
                         $db->query("SET NAMES 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'");
@@ -44,7 +42,6 @@ public static function configureObject( $instance )
                             } catch (Exception $e) {
                              }
                         }
-                        self::$connectionMaster = $db;
                         return $db;
                     } catch (Exception $e) {
                       error_log($e);
@@ -67,7 +64,6 @@ public static function configureObject( $instance )
              case false: // Default instance
              {
                 try {
-                    if (isset(self::$connectionMaster)) return self::$connectionMaster; // If we do not user slaves and slave request already got connection
                     self::$connectionStartTime = microtime(true);
                     $db = ezcDbFactory::create( "mysql://{$cfg->getSetting( 'db', 'user' )}:{$cfg->getSetting( 'db', 'password' )}@{$cfg->getSetting( 'db', 'host' )}:{$cfg->getSetting( 'db', 'port' )}/{$cfg->getSetting( 'db', 'database' )}" );
                     $db->query("SET NAMES 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'");
@@ -80,7 +76,6 @@ public static function configureObject( $instance )
                         }
                     }
                     self::$connectionTime = microtime(true) - self::$connectionStartTime;
-                    self::$connectionMaster = $db;
                     return $db;
                 } catch (Exception $e) {
                 	// Are we installed?