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

Merge branch '273-service-exceptions' into 'master'

Browse Source 
Services should throw exceptions for startup errors

Fixes #273

See merge request !134
This commit is contained in:
Torsten Grote
2016-04-06 15:51:03 +00:00
parent bd38a84322 b480777548
commit 21bb23ba67
12 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-core/src/org/briarproject/plugins/PluginManagerImpl.java
View File

@@ -8,6 +8,7 @@ import org.briarproject.api.event.TransportDisabledEvent;
import org.briarproject.api.event.TransportEnabledEvent;
import org.briarproject.api.lifecycle.IoExecutor;
import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.lifecycle.ServiceException;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginCallback;
@@ -83,7 +84,7 @@ class PluginManagerImpl implements PluginManager, Service {
}
@Override
public boolean start() {
public void startService() throws ServiceException {
// Instantiate and start the simplex plugins
LOG.info("Starting simplex plugins");
Collection<SimplexPluginFactory> sFactories =
@@ -103,15 +104,12 @@ class PluginManagerImpl implements PluginManager, Service {
sLatch.await();
dLatch.await();
} catch (InterruptedException e) {
LOG.warning("Interrupted while starting plugins");
Thread.currentThread().interrupt();
return false;
throw new ServiceException(e);
}
return true;
}
@Override
public boolean stop() {
public void stopService() throws ServiceException {
// Stop the poller
LOG.info("Stopping poller");
poller.stop();
@@ -131,11 +129,8 @@ class PluginManagerImpl implements PluginManager, Service {
try {
latch.await();
} catch (InterruptedException e) {
LOG.warning("Interrupted while stopping plugins");
Thread.currentThread().interrupt();
return false;
throw new ServiceException(e);
}
return true;
}
public Plugin getPlugin(TransportId t) {