From 8f082be6c929879c31498caf61181a2b252feca0 Mon Sep 17 00:00:00 2001
From: didfet <didfet@free.fr>
Date: Wed, 22 Jul 2015 11:47:50 +0200
Subject: [PATCH] Fix bug #14.

---
 src/main/java/info/fetter/logstashforwarder/Forwarder.java | 6 +++++-
 .../logstashforwarder/protocol/LumberjackClient.java       | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/info/fetter/logstashforwarder/Forwarder.java b/src/main/java/info/fetter/logstashforwarder/Forwarder.java
index cefbdf5..323af77 100644
--- a/src/main/java/info/fetter/logstashforwarder/Forwarder.java
+++ b/src/main/java/info/fetter/logstashforwarder/Forwarder.java
@@ -128,7 +128,11 @@ public class Forwarder {
 				fileReader.setAdapter(adapter);
 				inputReader.setAdapter(adapter);
 			} 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 {
 					Thread.sleep(networkTimeout);
 				} catch (InterruptedException e) {
diff --git a/src/main/java/info/fetter/logstashforwarder/protocol/LumberjackClient.java b/src/main/java/info/fetter/logstashforwarder/protocol/LumberjackClient.java
index 405663c..b07a27b 100644
--- a/src/main/java/info/fetter/logstashforwarder/protocol/LumberjackClient.java
+++ b/src/main/java/info/fetter/logstashforwarder/protocol/LumberjackClient.java
@@ -67,6 +67,13 @@ public class LumberjackClient implements ProtocolAdapter {
 		this.port = port;
 
 		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.load(new FileInputStream(keyStorePath), null);