shutdown all connections on shutdown

This commit is contained in:
Zlatin Balevsky
2019-06-14 20:53:54 +01:00
parent 8ff39072c7
commit a388eaec1d
3 changed files with 15 additions and 3 deletions

View File

@@ -69,6 +69,7 @@ public class Core {
private final ConnectionAcceptor connectionAcceptor
private final ConnectionEstablisher connectionEstablisher
private final HasherService hasherService
private final DownloadManager downloadManager
public Core(MuWireSettings props, File home, String myVersion) {
this.home = home
@@ -195,7 +196,7 @@ public class Core {
eventBus.register(ResultsEvent.class, searchManager)
log.info("initializing download manager")
DownloadManager downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
eventBus.register(UIDownloadEvent.class, downloadManager)
eventBus.register(UILoadedEvent.class, downloadManager)
eventBus.register(FileDownloadedEvent.class, downloadManager)
@@ -234,6 +235,9 @@ public class Core {
public void shutdown() {
connectionManager.shutdown()
downloadManager.shutdown()
connectionAcceptor.stop()
connectionEstablisher.stop()
}
static main(args) {

View File

@@ -135,4 +135,8 @@ public class DownloadManager {
}
}
}
public void shutdown() {
downloaders.each { it.stop() }
}
}

View File

@@ -169,11 +169,15 @@ public class Downloader {
public void cancel() {
cancelled = true
stop()
file.delete()
piecesFile.delete()
}
void stop() {
activeWorkers.values().each {
it.cancel()
}
file.delete()
piecesFile.delete()
}
public int activeWorkers() {