Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor cleanup after Replay REST Changes #142

Merged
merged 2 commits into from
Dec 4, 2017
Merged

Minor cleanup after Replay REST Changes #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e0ba1
Remove clusterName option from forklift server
Kuroshii Dec 2, 2017
6b86d8c
Update README + plugin doc to reflect that replay uses REST
Kuroshii Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
----

Expand Down
3 changes: 1 addition & 2 deletions doc/PLUGINS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ final ReplayES replayPlugin = new ReplayES(
replayServer,
elasticSearchHost,
elasticSearchPort,
elasticSearchCluster,
connector
);

Expand Down Expand Up @@ -154,4 +153,4 @@ public class FooPlugin {
log.info("Validating: " + foo.value());
}
}
```
```
11 changes: 0 additions & 11 deletions server/src/main/java/forklift/ForkliftOpts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion server/src/main/java/forklift/ForkliftServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down