Merge pull request #8 from diegopacheco/dev

Telemetry mode + Update to dyno 1.5.7
diegopacheco · Feb 10, 2017 · 069355d · 069355d
2 parents e81d606 + b3a4837
commit 069355d
Show file tree

Hide file tree

Showing 15 changed files with 601 additions and 178 deletions.
diff --git a/dynomite-cluster-checker/build.gradle b/dynomite-cluster-checker/build.gradle
@@ -45,10 +45,11 @@ dependencies {
 	compile([
 			   'javax.servlet:servlet-api:2.5',
 			   'org.apache.commons:commons-lang3:3.4',
-			   'org.slf4j:slf4j-simple:1.7.21'
+			   'org.slf4j:slf4j-simple:1.7.21',
+			   'com.netflix.hystrix:hystrix-core:1.5.6'
 		    ])
     testCompile('junit:junit:4.11')
-	compile('com.netflix.dyno:dyno-jedis:1.4.7'){
+	compile('com.netflix.dyno:dyno-jedis:1.5.7'){
 	     exclude group: 'org.slf4j', module: 'slf4j-api'
 	}		    
 }

diff --git a/dynomite-cluster-checker/gradle.properties b/dynomite-cluster-checker/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false -server -Xmx2048m -Xms128m 
diff --git a/...ecker/src/main/java/com/github/diegopacheco/dynomite/cluster/checker/CheckerResponse.java b/...ecker/src/main/java/com/github/diegopacheco/dynomite/cluster/checker/CheckerResponse.java
@@ -88,6 +88,7 @@ public void setGetError(String getError) {
 		this.getError = getError;
 	}
 
+
 	public void cleanUp(){
 		setInsertTime(null);
 		setGetTime(null);
@@ -123,13 +124,17 @@ public String toPrettyTelemetryJson(){
 				pritIfNotNull("    \"server\":\""  + server + "\",\r\n",server) +
 				pritIfNotNull("    \"seeds\":\"" + seeds + "\",\r\n",seeds) +
 				pritIfNotNull("    \"insertTime\":\"" + getInsertTime(insertTime)  + "\",\r\n",insertTime) +
-				pritIfNotNull("    \"getTime\":\""    + new Double(getTime.replace("ms", "").trim()).intValue() + "\",\r\n",getTime) +
+				pritIfNotNull("    \"getTime\":\""    + new Double(getTime().replace("ms", "").trim()).intValue() + "\",\r\n",getTime) +
 				pritIfNotNull("    \"insertError\":\""  + resolveErrorTelemetry(insertError) + "\",\r\n",resolveErrorTelemetry(insertError)) +
 				pritIfNotNull("    \"getError\":\""     + resolveErrorTelemetry(getError) + "\",\r\n",resolveErrorTelemetry(getError))       +
 				"    \"consistency\":\""  + resolveBoolean(consistency) + "\"\r\n" +
 				"  }";
 	}
 
+	private String getTime() {
+		return getTime == null ? "0" : getTime;
+	}
+
 	private int getInsertTime(String insertTime)  {
 		return (insertTime == null) ? 0 : new Double(insertTime.replace("ms", "").trim()).intValue();
 	}