Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

[tcp] Add and improve log of reader/writer thread termination

Browse source
This commit is contained in:
Florian Schmaus 2020-06-16 22:59:26 +02:00
parent 018cba7f4f
commit f9292a23fb
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -500,18 +500,18 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
if (!packetWriter.done()) { if (!packetWriter.done()) {
// First shutdown the writer, this will result in a closing stream element getting send to // First shutdown the writer, this will result in a closing stream element getting send to
// the server // the server
LOGGER.finer("PacketWriter shutdown()"); LOGGER.finer(packetWriter.threadName + " shutdown()");
packetWriter.shutdown(instant); packetWriter.shutdown(instant);
LOGGER.finer("PacketWriter has been shut down"); LOGGER.finer(packetWriter.threadName + " shutdown() returned");
if (!instant) { if (!instant) {
waitForClosingStreamTagFromServer(); waitForClosingStreamTagFromServer();
} }
} }
LOGGER.finer("PacketReader shutdown()"); LOGGER.finer(packetReader.threadName + " shutdown()");
packetReader.shutdown(); packetReader.shutdown();
LOGGER.finer("PacketReader has been shut down"); LOGGER.finer(packetReader.threadName + " shutdown() returned");
CloseableUtil.maybeClose(socket, LOGGER); CloseableUtil.maybeClose(socket, LOGGER);
@ -520,7 +520,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
try { try {
boolean readerAndWriterThreadsTermianted = waitForCondition(() -> !packetWriter.running && !packetReader.running); boolean readerAndWriterThreadsTermianted = waitForCondition(() -> !packetWriter.running && !packetReader.running);
if (!readerAndWriterThreadsTermianted) { if (!readerAndWriterThreadsTermianted) {
LOGGER.severe("Reader and writer threads did not terminate"); LOGGER.severe("Reader and/or writer threads did not terminate timely. Writer running: "
+ packetWriter.running + ", Reader running: " + packetReader.running);
} else {
LOGGER.fine("Reader and writer threads terminated");
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
LOGGER.log(Level.FINE, "Interrupted while waiting for reader and writer threads to terminate", e); LOGGER.log(Level.FINE, "Interrupted while waiting for reader and writer threads to terminate", e);