echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I2CP: Fix client notifier thread name

Browse Source
This commit is contained in:
zzz
2020-04-16 13:22:23 +00:00
parent 12ac06d5ba
commit b3d5accca2
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/src/net/i2p/client/impl/I2PSessionImpl.java
View File

@ -814,7 +814,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
+ (connected - startConnect) + (connected - startConnect)
+ "ms - ready to participate in the network!"); + "ms - ready to participate in the network!");
} }
Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true); Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getName(), true);
notifier.start(); notifier.start();
startIdleMonitor(); startIdleMonitor();
startVerifyUsage(); startVerifyUsage();
@ -1475,6 +1475,25 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
protected String getPrefix() { protected String getPrefix() {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append('['); buf.append('[');
getName(buf);
buf.append('(').append(_state.toString()).append(')');
buf.append("]: ");
return buf.toString();
}
/**
* @since 0.9.46
*/
protected String getName() {
StringBuilder buf = new StringBuilder();
getName(buf);
return buf.toString();
}
/**
* @since 0.9.46
*/
private void getName(StringBuilder buf) {
String s = _options.getProperty("inbound.nickname"); String s = _options.getProperty("inbound.nickname");
if (s != null) if (s != null)
buf.append(s); buf.append(s);
@ -1483,9 +1502,6 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
SessionId id = _sessionId; SessionId id = _sessionId;
if (id != null) if (id != null)
buf.append(" #").append(id.getSessionId()); buf.append(" #").append(id.getSessionId());
buf.append('(').append(_state.toString()).append(')');
buf.append("]: ");
return buf.toString();
} }
/** /**

2
core/java/src/net/i2p/client/impl/SubSession.java
View File

@ -129,7 +129,7 @@ class SubSession extends I2PSessionMuxedImpl {
} }
synchronized(_stateLock) { synchronized(_stateLock) {
if (_state != State.OPEN) { if (_state != State.OPEN) {
Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true); Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getName(), true);
notifier.start(); notifier.start();
changeState(State.OPEN); changeState(State.OPEN);
} }