Merge pull request #142 from dcshock/feature/clean-after-replay-rest

Minor cleanup after Replay REST Changes
dcshock · Dec 4, 2017 · d960eb5 · d960eb5
2 parents 3ea47ae + 6b86d8c
commit d960eb5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/README.adoc b/README.adoc
@@ -11,7 +11,7 @@ link:doc/forklift.adoc[Documentation]
 link:doc/prev_releases.adoc[Previous Releases]
 
 * *December 2nd 2017* - v3.0
-** Upgrade replay logging to utilize Elastic Search 5
+** Use REST instead of transport for replay, adding support for Elastic Search 5
 
 * *Novemeber 28th 2017* - v2.3
 ** Update build to automate releases to sonatype
@@ -81,8 +81,7 @@ forklift-server
  -retryESHost $FORKLIFT_ES_HOST 
  -retryESPort $FORKLIFT_ES_PORT 
  -replayESHost $FORKLIFT_ES_HOST 
- -replayESPort $FORKLIFT_ES_TRANSPORT_PORT 
- -replayESCluster $FORKLIFT_ES_CLUSTER 
+ -replayESPort $FORKLIFT_ES_PORT 
  $FORKLIFT_RETRIES
 ----
 

diff --git a/doc/PLUGINS.md b/doc/PLUGINS.md
@@ -95,7 +95,6 @@ final ReplayES replayPlugin = new ReplayES(
  replayServer,
  elasticSearchHost,
  elasticSearchPort,
- elasticSearchCluster,
  connector
 );
 
@@ -154,4 +153,4 @@ public class FooPlugin {
  log.info("Validating: " + foo.value());
  }
 }
-```
+```
diff --git a/server/src/main/java/forklift/ForkliftOpts.java b/server/src/main/java/forklift/ForkliftOpts.java
@@ -45,9 +45,6 @@ public class ForkliftOpts {
  @Option(name="-consulHost", usage="consul host name")
  private String consulHost = "localhost";
 
- @Option(name="-replayESCluster", usage="name of the elastic search cluster to use for replay logs.")
- private String replayESCluster = "elasticsearch";
-
  public String getConsumerDir() {
  return consumerDir;
  }
@@ -159,12 +156,4 @@ public void setRunRetries(boolean runRetries) {
  public boolean isRunRetries() {
  return runRetries;
  }
-
- public String getReplayESCluster() {
- return replayESCluster;
- }
-
- public void setReplayESCluster(String replayESCluster) {
- this.replayESCluster = replayESCluster;
- }
 }
diff --git a/server/src/main/java/forklift/ForkliftServer.java b/server/src/main/java/forklift/ForkliftServer.java
@@ -260,7 +260,7 @@ private ReplayES setupESReplayHandling(Forklift forklift) {
  if (opts.getReplayESHost() == null)
  replayES = null;
  else
- replayES = new ReplayES(!opts.isReplayESServer(), opts.getReplayESHost(), opts.getReplayESPort(), opts.getReplayESCluster(), forklift.getConnector());
+ replayES = new ReplayES(!opts.isReplayESServer(), opts.getReplayESHost(), opts.getReplayESPort(), forklift.getConnector());
  return replayES;
  }