goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not exit accept loop on I2PExceptions, GitHub issue #123

dbus-notify
Zlatin Balevsky 2022-03-05 15:13:25 +00:00
parent 75f65a61ca
commit 1fa2ee99f6
No known key found for this signature in database
GPG Key ID: A72832072D525E41
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
View File

@ -36,6 +36,8 @@ class I2PConnector {
synchronized void connect() { synchronized void connect() {
if (socketManager != null) if (socketManager != null)
return return
while(true) {
I2PSocketManager socketManager
keyDat.withInputStream { keyDat.withInputStream {
socketManager = new I2PSocketManagerFactory().createDisconnectedManager(it, i2cpHost, i2cpPort, i2pProperties) socketManager = new I2PSocketManagerFactory().createDisconnectedManager(it, i2cpHost, i2cpPort, i2pProperties)
} }
@ -43,14 +45,20 @@ class I2PConnector {
setReadTimeout(60000) setReadTimeout(60000)
setConnectTimeout(15000) setConnectTimeout(15000)
} }
socketManager.addDisconnectListener { socketManager.addDisconnectListener({
socketManager = null this.socketManager = null
eventBus.publish(new RouterDisconnectedEvent()) eventBus.publish(new RouterDisconnectedEvent())
} } as I2PSocketManager.DisconnectListener)
def session = socketManager.getSession() def session = socketManager.getSession()
try {
session.connect() session.connect()
this.socketManager = socketManager
eventBus.publish(new RouterConnectedEvent(session: session)) eventBus.publish(new RouterConnectedEvent(session: session))
} catch (Exception e) {
Thread.sleep(1000)
}
}
} }
synchronized void shutdown() { synchronized void shutdown() {