Febbweiss/logstash-forwarder-java
1
0
Fork 0
mirror of https://github.com/Febbweiss/logstash-forwarder-java.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #14.

Browse Source
This commit is contained in:
didfet
2015-07-22 11:47:50 +02:00
parent 6a405a5e68
commit 8f082be6c9
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/info/fetter/logstashforwarder/Forwarder.java
View File

@@ -128,7 +128,11 @@ public class Forwarder {
fileReader.setAdapter(adapter); fileReader.setAdapter(adapter);
inputReader.setAdapter(adapter); inputReader.setAdapter(adapter);
} catch(Exception ex) { } catch(Exception ex) {
logger.error("Failed to connect to server " + serverList.get(randomServerIndex) + " : ",ex); if(logger.isDebugEnabled()) {
logger.error("Failed to connect to server " + serverList.get(randomServerIndex) + " : ", ex);
} else {
logger.error("Failed to connect to server " + serverList.get(randomServerIndex) + " : " + ex.getMessage());
}
try { try {
Thread.sleep(networkTimeout); Thread.sleep(networkTimeout);
} catch (InterruptedException e) { } catch (InterruptedException e) {

7
src/main/java/info/fetter/logstashforwarder/protocol/LumberjackClient.java
View File

@@ -67,6 +67,13 @@ public class LumberjackClient implements ProtocolAdapter {
this.port = port; this.port = port;
try { try {
if(keyStorePath == null) {
throw new IOException("Key store not configured");
}
if(server == null) {
throw new IOException("Server address not configured");
}
keyStore = KeyStore.getInstance("JKS"); keyStore = KeyStore.getInstance("JKS");
keyStore.load(new FileInputStream(keyStorePath), null); keyStore.load(new FileInputStream(keyStorePath), null);