From 990c312b0f345b90e9d3a91afc15d65133d81fe6 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 14 May 2020 18:05:43 +0200
Subject: [PATCH] FEAT #13834 TIME 0:30 Fix database cluster
---
.gitlab-ci.yml | 1 +
src/core/models/DatabasePDO.php | 2 ++
2 files changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bcd4de8f36..d19769c583e 100755
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/src/core/models/DatabasePDO.php b/src/core/models/DatabasePDO.php
index b805dfd3a2c..bd8e860f56c 100755
--- a/src/core/models/DatabasePDO.php
+++ b/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;
--
GitLab