FEAT #13834 TIME 0:30 Fix database cluster

.gitlab-ci.yml

@@ -38,6 +38,7 @@ before_script:
   - ln -s $CI_PROJECT_DIR /var/www/html/MaarchCourrier
   - cd /var/www/html/MaarchCourrier
   - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
+  - cp apps/maarch_entreprise/xml/config.json.default apps/maarch_entreprise/xml/config.json
   - cp modules/visa/xml/remoteSignatoryBooks.xml.default modules/visa/xml/remoteSignatoryBooks.xml
   - apt-get install -yqq openjdk-11-jdk > /dev/null
 

src/core/models/DatabasePDO.php

@@ -77,10 +77,12 @@ class DatabasePDO
             $dsn = "{$formattedDriver}:host={$server};port={$port};dbname={$name}";
             try {
                 self::$pdo = new \PDO($dsn, $user, $password, $options);
+                break;
             } catch (\PDOException $PDOException) {
                 try {
                     $options[\PDO::ATTR_PERSISTENT] = false;
                     self::$pdo = new \PDO($dsn, $user, $password, $options);
+                    break;
                 } catch (\PDOException $PDOException) {
                     if (!empty($jsonFile['database'][$key + 1])) {
                         continue;