SUMOK-17 Added option to use Log4j to Config properties

Author: Juan Pablo Diaz-Vaz

src/main/java/com/mcplusa/sumologic/KinesisConnectorForSumologicConfiguration.java

@@ -14,15 +14,25 @@
 public class KinesisConnectorForSumologicConfiguration extends KinesisConnectorConfiguration {
     // Properties added for Sumologic
     public static final String PROP_SUMOLOGIC_URL = "sumologicUrl";
+    public static final String PROP_SUMOLOGIC_USE_LOG4J = "useLog4j";
     public final String SUMOLOGIC_URL;
+    public final boolean SUMOLOGIC_USE_LOG4J;
+    
+    public final boolean DEFAULT_SUMOLOGIC_USE_LOG4J = false;
 
     /**
      * Configure the connector application with any set of properties that are unique to the application. Any
      * unspecified property will be set to a default value.
      */
     public KinesisConnectorForSumologicConfiguration(Properties properties, AWSCredentialsProvider credentialsProvider) {
         super(properties, credentialsProvider);
-        
         SUMOLOGIC_URL = properties.getProperty(PROP_SUMOLOGIC_URL, null);
+        SUMOLOGIC_USE_LOG4J = getBooleanProperty(PROP_SUMOLOGIC_USE_LOG4J, 
+            DEFAULT_SUMOLOGIC_USE_LOG4J, properties);
     }
+    
+    private boolean getBooleanProperty(String property, boolean defaultValue, Properties properties) {
+      String propertyValue = properties.getProperty(property, Boolean.toString(defaultValue));
+      return Boolean.parseBoolean(propertyValue);
+  }
 }

src/main/java/com/mcplusa/sumologic/SumologicSender.java

@@ -21,9 +21,7 @@
 
 public class SumologicSender {
   private static final Log LOG = LogFactory.getLog(SumologicSender.class);
-    
-  private static final boolean USE_LOG4J = true;
-
+ 
   private String url = null;  
   private HttpClient httpClient = null;
 
@@ -32,31 +30,33 @@ public class SumologicSender {
   private static final int RETRIES = 3;
   private static final int SLEEP_TIME = 1000;
 
-	public SumologicSender(String url) {
+  private boolean useLog4j = false;
+  
+	public SumologicSender(String url, boolean useLog4j) {
 		  this.url = url;
+		  this.useLog4j = useLog4j;
 
-	    HttpParams params = new BasicHttpParams();
-	    HttpConnectionParams.setConnectionTimeout(params, connectionTimeout);
-	    HttpConnectionParams.setSoTimeout(params, socketTimeout);
-	    httpClient = new DefaultHttpClient(new ThreadSafeClientConnManager(), params);
+		  if (!useLog4j) {
+    	    HttpParams params = new BasicHttpParams();
+    	    HttpConnectionParams.setConnectionTimeout(params, connectionTimeout);
+    	    HttpConnectionParams.setSoTimeout(params, socketTimeout);
+    	    httpClient = new DefaultHttpClient(new ThreadSafeClientConnManager(), params);
+		  }
 	}
 
 	public boolean sendToSumologicUsingLog4j(String data) {
 	  Logger sumologicLog = Logger.getLogger("sumologic");
     sumologicLog.trace(data);
 	  return true;
 	}
-
-	public boolean sendToSumologic(String data) throws IOException{
-	  if (USE_LOG4J)
-	    return sendToSumologicUsingLog4j(data);
-	  
+	
+	public boolean sendToSumologicUsingHTTPRequest(String data) throws IOException {
 	  int retries = RETRIES;
-	  int sleep_time = SLEEP_TIME;
-	  int statusCode;
-	  
-	  do {
-    	  HttpPost post = null;
+    int sleep_time = SLEEP_TIME;
+    int statusCode;
+    
+    do {
+      HttpPost post = null;
       post = new HttpPost(url);
       post.setEntity(new StringEntity(data, HTTP.PLAIN_TEXT_TYPE, HTTP.UTF_8));
       HttpResponse response = httpClient.execute(post);
@@ -74,7 +74,7 @@ public boolean sendToSumologic(String data) throws IOException{
           Thread.sleep(sleep_time);
         } catch (InterruptedException ignore) {}
       }
-	  } while (statusCode == 429 && retries > 0);
+    } while (statusCode == 429 && retries > 0);
 
     // Check if the request was successful;
     if (statusCode != 200) {
@@ -85,4 +85,13 @@ public boolean sendToSumologic(String data) throws IOException{
       return true;
     } 
 	}
+
+	public boolean sendToSumologic(String data) throws IOException{
+	  if (this.useLog4j) {
+	    return sendToSumologicUsingLog4j(data);
+	  }
+	  else {
+	    return sendToSumologicUsingHTTPRequest(data);
+	  }
+	}
 }

src/main/java/com/mcplusa/sumologic/implementations/SumologicEmitter.java

@@ -31,11 +31,11 @@ public class SumologicEmitter implements IEmitter<String> {
 
     public SumologicEmitter(KinesisConnectorConfiguration configuration) {
         this.config = (KinesisConnectorForSumologicConfiguration) configuration;
-        sender = new SumologicSender(this.config.SUMOLOGIC_URL);
+        sender = new SumologicSender(config.SUMOLOGIC_URL, config.SUMOLOGIC_USE_LOG4J);
     }
 
-    public SumologicEmitter(String url) {
-        sender = new SumologicSender(url);
+    public SumologicEmitter(String url, boolean useLog4j) {
+        sender = new SumologicSender(url, useLog4j);
     }
 
     @Override

src/test/java/com/mcplusa/sumologic/implementations/SumologicEmitterTest.java

@@ -39,7 +39,7 @@ public void theEmitterShouldReturnTheListParameterWhenFailing () {
     messages.add("This is message #3");
     messages.add("This is message #4");
 
-    SumologicEmitter emitter = new SumologicEmitter(url);
+    SumologicEmitter emitter = new SumologicEmitter(url, false);
     List <String> notEmittedMessages = emitter.sendBatchConcatenating(messages);
 
     Assert.assertEquals(messages, notEmittedMessages);
@@ -55,7 +55,7 @@ public void theEmitterShouldReturnAnEmptyListOnSuccess () {
     messages.add("This is message #3");
     messages.add("This is message #4");
 
-    SumologicEmitter emitter = new SumologicEmitter(url);
+    SumologicEmitter emitter = new SumologicEmitter(url, false);
     List <String> notEmittedMessages = emitter.sendBatchConcatenating(messages);
 
     Assert.assertEquals(0, notEmittedMessages.size());