MAGECLOUD-1520: Initial builds failing (#137)

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

* MAGECLOUD-1520: Initial builds failing

Author: oshmyheliuk

src/DB/Connection.php

@@ -13,6 +13,8 @@
  */
 class Connection implements ConnectionInterface
 {
+    const MYSQL_ERROR_CODE_SERVER_GONE_AWAY = 2006;
+
     /**
      * @var \PDO
      */
@@ -130,19 +132,44 @@ public function bindValues(\PDOStatement $statement, array $bindings)
      */
     public function getPdo(): \PDO
     {
-        if (null === $this->pdo) {
-            $environment = $this->environment;
-
-            $this->pdo = new \PDO(
-                sprintf('mysql:dbname=%s;host=%s', $environment->getDbName(), $environment->getDbHost()),
-                $environment->getDbUser(),
-                $environment->getDbPassword()
-            );
+        $this->connect();
+
+        try {
+            $this->pdo->query('SELECT 1');
+        } catch (\Exception $e) {
+            if ($this->pdo->errorInfo()[1] !== self::MYSQL_ERROR_CODE_SERVER_GONE_AWAY) {
+                throw $e;
+            }
+
+            $this->logger->notice('Lost connection to Mysql server. Reconnecting.');
+            $this->pdo = null;
+            $this->connect();
         }
 
         return $this->pdo;
     }
 
+    /**
+     * Create PDO connection.
+     */
+    private function connect()
+    {
+        if ($this->pdo instanceof \PDO) {
+            return;
+        }
+
+        $environment = $this->environment;
+
+        $this->pdo = new \PDO(
+            sprintf('mysql:dbname=%s;host=%s', $environment->getDbName(), $environment->getDbHost()),
+            $environment->getDbUser(),
+            $environment->getDbPassword(),
+            [
+                \PDO::ATTR_PERSISTENT => true
+            ]
+        );
+    }
+
     /**
      * @param string $query
      * @param array $bindings

src/Test/Unit/DB/ConnectionTest.php

@@ -107,4 +107,25 @@ public function testGetPdo()
     {
         $this->assertSame($this->pdoMock, $this->connection->getPdo());
     }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Some exception
+     */
+    public function testGetPdoWithException()
+    {
+        $this->pdoMock->expects($this->once())
+            ->method('query')
+            ->with('SELECT 1')
+            ->willThrowException(new \Exception('Some exception'));
+        $this->pdoMock->expects($this->once())
+            ->method('errorInfo')
+            ->willReturn([
+                'HY000',
+                2000,
+                'Some message'
+            ]);
+
+        $this->connection->getPdo();
+    }
 }