Ensure timeout set upon connection creation

mybuilder · Jan 19, 2022 · 3aa61ba · 3aa61ba
1 parent ceea097
commit 3aa61ba
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/runtime/lib/Propel.php b/runtime/lib/Propel.php
@@ -683,16 +683,17 @@ public static function initConnection($conparams, $name, $defaultClass = Propel:
         }
 
         try {
-            $con = new $classname($dsn, $user, $password, $driver_options);
-            $con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            $con->setAttribute(PropelPDO::PROPEL_ATTR_CONNECTION_NAME, $name);
-
             // With the PropelBundle Symfony integration there is no way to correctly specify PDO attributes.
             // The configuration schema requires a scalar value, however Propel requires a keyed 'value' array.
             // This allows us to specify the timeout within the runtime environment (i.e for Lambda).
             if ($connectionTimeout = \getenv('PROPEL_PDO_CONNECTION_TIMEOUT')) {
-                $con->setAttribute(\PDO::ATTR_TIMEOUT, $connectionTimeout);
+                $driver_options[\PDO::ATTR_TIMEOUT] = $connectionTimeout;
+                $driver_options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_EXCEPTION;
             }
+
+            $con = new $classname($dsn, $user, $password, $driver_options);
+            $con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $con->setAttribute(PropelPDO::PROPEL_ATTR_CONNECTION_NAME, $name);
         } catch (PDOException $e) {
             throw new PropelException("Unable to open PDO connection", $e);
         }