merge resloved

Author: blackopsdev

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>com.stackify</groupId>
 	<artifactId>stackify-api-common</artifactId>
-	<version>1.0.10-SNAPSHOT</version>
+	<version>1.0.11-SNAPSHOT</version>
 
 	<name>Stackify API Common</name>
 	<description>Stackify API Common</description>

src/main/java/com/stackify/api/common/log/LogBackgroundServiceScheduler.java

@@ -27,12 +27,7 @@
  * @author Eric Martin
  */
 public class LogBackgroundServiceScheduler extends CustomScheduler {
-	
-	/**
-	 * One tenth of a second (milliseconds)
-	 */
-	private static final long ONE_TENTH_OF_A_SECOND = 100;
-	
+		
 	/**
 	 * One second (milliseconds)
 	 */
@@ -78,9 +73,9 @@ public void update(final int numSent) {
 		if (100 <= numSent) {
 
 			// messages are coming in quickly so decrease our delay
-			// minimum delay is 1/10 of a second
+			// minimum delay is 1 second
 
-			scheduleDelay = Math.max(Math.round(scheduleDelay / 2.0), ONE_TENTH_OF_A_SECOND);
+			scheduleDelay = Math.max(Math.round(scheduleDelay / 2.0), ONE_SECOND);
 
 		} else if (numSent < 10) {
 

src/main/java/com/stackify/api/common/log/LogCollector.java

@@ -38,6 +38,11 @@
  */
 public class LogCollector {
 
+	/**
+	 * Max batch size of log messages to be sent in a single request
+	 */
+	private static final int MAX_BATCH = 100;
+
 	/**
 	 * The logger (project) name
 	 */
@@ -56,7 +61,7 @@ public class LogCollector {
 	/**
 	 * The queue of objects to be transmitted
 	 */
-	private final Queue<LogMsg> queue = Queues.synchronizedQueue(EvictingQueue.<LogMsg>create(1000));
+	private final Queue<LogMsg> queue = Queues.synchronizedQueue(EvictingQueue.<LogMsg>create(10000));
 
 	/**
 	 * Constructor
@@ -100,15 +105,15 @@ public int flush(final LogSender sender) throws IOException, HttpException {
 			while (numSent < maxToSend) {
 
 				// get the next batch of messages
-				int batchSize = Math.min(maxToSend - numSent, 20);
+				int batchSize = Math.min(maxToSend - numSent, MAX_BATCH);
 
 				List<LogMsg> batch = Lists.newArrayListWithCapacity(batchSize);
 
 				for (int i = 0; i < batchSize; ++i) {
 					batch.add(queue.remove());
 				}
 
-				// build the log message group testAddAndFlushrecord
+				// build the log message group
 				LogMsgGroup group = createLogMessageGroup(batch, logger, envDetail, appIdentity);
 
 				// send the batch to Stackify

src/test/java/com/stackify/api/common/ApiConfigurationTest.java

@@ -54,7 +54,7 @@ public void testBuilder() {
 		Assert.assertEquals(environment, apiConfig.getEnvironment());
 		Assert.assertEquals(envDetail, apiConfig.getEnvDetail());
 
-		Assert.assertNotNull(envDetail.toString());
+		Assert.assertNotNull(apiConfig.toString());
 	}
 
 	/**

src/test/java/com/stackify/api/common/http/HttpClientTest.java

@@ -92,4 +92,33 @@ public void testPostWithHttpError() throws Exception {
 
 		httpClient.post("path", "hello".getBytes());
 	}
+	
+	/**
+	 * testPostWithGzip
+	 * @throws Exception 
+	 */
+	@Test
+	public void testPostWithGzip() throws Exception {
+		
+		URL url = PowerMockito.mock(URL.class);
+		PowerMockito.whenNew(URL.class).withArguments(Mockito.anyString()).thenReturn(url);
+		
+		HttpURLConnection connection = PowerMockito.mock(HttpURLConnection.class);
+		
+		PowerMockito.when(url.openConnection()).thenReturn(connection);
+		
+		ByteArrayOutputStream postBody = new ByteArrayOutputStream();
+		PowerMockito.when(connection.getOutputStream()).thenReturn(postBody);
+		
+		ByteArrayInputStream contents = new ByteArrayInputStream("world".getBytes());
+		PowerMockito.when(connection.getInputStream()).thenReturn(contents);
+		PowerMockito.when(connection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_OK);
+
+		HttpClient httpClient = new HttpClient(Mockito.mock(ApiConfiguration.class));
+		
+		String world = httpClient.post("path", "hello".getBytes(), true);
+		
+		Assert.assertNotNull(world);
+		Assert.assertEquals("world", world);
+	}
 }

src/test/java/com/stackify/api/common/log/LogBackgroundServiceSchedulerTest.java

@@ -201,18 +201,9 @@ public void testUpdateWithIncreaseAndDecrease() {
 		Assert.assertEquals(1250, scheduler.getScheduleDelay());
 
 		scheduler.update(1000);
-		Assert.assertEquals(625, scheduler.getScheduleDelay());
-
-		scheduler.update(1000);
-		Assert.assertEquals(313, scheduler.getScheduleDelay());
-
-		scheduler.update(1000);
-		Assert.assertEquals(157, scheduler.getScheduleDelay());
-
-		scheduler.update(1000);
-		Assert.assertEquals(100, scheduler.getScheduleDelay());
+		Assert.assertEquals(1000, scheduler.getScheduleDelay());
 
 		scheduler.update(1000);
-		Assert.assertEquals(100, scheduler.getScheduleDelay());		
+		Assert.assertEquals(1000, scheduler.getScheduleDelay());	
 	}
 }