Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Continue shutdown if an exception is thrown.

Browse Source
This commit is contained in:
akwizgran
2022-06-09 17:16:02 +01:00
parent efb1b8c1ad
commit 85d1addd04
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java
View File

@@ -198,11 +198,15 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener {
state = STOPPING; state = STOPPING;
eventBus.broadcast(new LifecycleEvent(STOPPING)); eventBus.broadcast(new LifecycleEvent(STOPPING));
for (Service s : services) { for (Service s : services) {
long start = now(); try {
s.stopService(); long start = now();
if (LOG.isLoggable(FINE)) { s.stopService();
logDuration(LOG, "Stopping service " if (LOG.isLoggable(FINE)) {
+ s.getClass().getSimpleName(), start); logDuration(LOG, "Stopping service "
+ s.getClass().getSimpleName(), start);
}
} catch (ServiceException e) {
logException(LOG, WARNING, e);
} }
} }
for (ExecutorService e : executors) { for (ExecutorService e : executors) {
@@ -212,12 +216,14 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener {
} }
e.shutdownNow(); e.shutdownNow();
} }
long start = now(); try {
db.close(); long start = now();
logDuration(LOG, "Closing database", start); db.close();
logDuration(LOG, "Closing database", start);
} catch (DbException e) {
logException(LOG, WARNING, e);
}
shutdownLatch.countDown(); shutdownLatch.countDown();
} catch (DbException | ServiceException e) {
logException(LOG, WARNING, e);
} finally { } finally {
startStopSemaphore.release(); startStopSemaphore.release();
} }