Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

we may have received a tcp FIN. in such case we should establish a new connection. #84

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

we may have received a tcp FIN. in such case we should establish a new connection. #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/main/java/com/cloudbees/syslog/sender/TcpSyslogMessageSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.math.BigInteger;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.net.*;
import java.nio.charset.StandardCharsets;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
Expand Down Expand Up @@ -143,6 +139,30 @@ private synchronized void ensureSyslogServerConnection() throws IOException {
} catch (Exception e) {
socketIsValid = false;
}
if (socketIsValid) { //we may have received a tcp FIN. in such case we should establish a new connection.
int configuredSoTimeout = socket.getSoTimeout();//keep the current value
try {
//(Note: no 'real' data is expected to be received from the syslog server)
//we intend to read from the socket in order to check if a FIN was sent.
//if it was, read will return -1.
//but if not (which is usual case) we will remain blocked by the read().
//in order to minimize the blocking time, we're temporarily setting the timeout to the minimal possible value (1 millisecond)
socket.setSoTimeout(1);
int read = socket.getInputStream().read();
if (read == -1) { //we've received a FIN from the server
logger.fine("A TCP FIN was received from the syslog server. marking current socket as invalid");
socketIsValid = false;
}
} catch (SocketTimeoutException socketTimeoutException) {
//do nothing. this is the expected.
} catch (IOException e) {
//if any other exception, we don't know what is the problem, but we better mark the socket as invalid.
logger.finer("couldn't read from socket. (for checking if a FIN was received). marking current socket as invalid. " + e.getMessage());
socketIsValid = false;
} finally {
socket.setSoTimeout(configuredSoTimeout);//restore
}
}
if (!socketIsValid) {
writer = null;
try {
Expand Down
Loading