test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8744 Handling of database connection problems on middleware startup (fail immediately if main database is unavailable)

Browse Source
This commit is contained in:
Konstantin Krivopustov 2017-04-05 16:17:27 +04:00
parent ce3f4d6a27
commit 56db6f8f7d
1 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
modules/core/src/com/haulmont/cuba/core/sys/AppContextLoader.java
View File

@ -110,49 +110,31 @@ public class AppContextLoader extends AbstractWebAppContextLoader {
}
protected void updateDatabase(DbUpdater updater) {
while (true) {
try {
updater.updateDatabase();
return;
} catch (DbInitializationException e) {
if (e.isRetryPossible()) {
log.error("Error updating database: {}\nWaiting 5 sec and retrying...", e.toString());
try {
Thread.sleep(5000);
} catch (InterruptedException e1) {
Thread.currentThread().interrupt();
}
} else {
throw new RuntimeException("Error updating database", e);
}
}
try {
updater.updateDatabase();
} catch (DbInitializationException e) {
throw new RuntimeException("\n" +
"==============================================================================\n" +
"ERROR: Cannot check and update database. See the stacktrace below for details.\n" +
"==============================================================================", e);
}
}
protected void checkDatabase(DbUpdater updater) {
while (true) {
try {
boolean initialized = updater.dbInitialized();
if (!initialized) {
throw new IllegalStateException("\n" +
"============================================================================\n" +
"ERROR: Database is not initialized. Set 'cuba.automaticDatabaseUpdate'\n" +
"application property to 'true' to initialize and update database on startup.\n" +
"============================================================================");
}
return;
} catch (DbInitializationException e) {
if (e.isRetryPossible()) {
log.error("Error connecting to database: {}\nWaiting 5 sec and retrying...", e.toString());
try {
Thread.sleep(5000);
} catch (InterruptedException e1) {
Thread.currentThread().interrupt();
}
} else {
throw new RuntimeException("Error checking database", e);
}
try {
boolean initialized = updater.dbInitialized();
if (!initialized) {
throw new IllegalStateException("\n" +
"============================================================================\n" +
"ERROR: Database is not initialized. Set 'cuba.automaticDatabaseUpdate'\n" +
"application property to 'true' to initialize and update database on startup.\n" +
"============================================================================");
}
} catch (DbInitializationException e) {
throw new RuntimeException("\n" +
"===================================================================\n" +
"ERROR: Cannot check database. See the stacktrace below for details.\n" +
"===================================================================", e);
}
}
}