[fix] fixed shield integration

- updated Shield version to 1.2.1 (final)
- Not all requests sent via the client proxy where set with the `__watcher_user`

Fixes elastic/elasticsearch#283

Original commit: elastic/x-pack-elasticsearch@3a36bd4d55
This commit is contained in:
uboness 2015-04-30 02:08:27 +02:00
parent 19d1e32453
commit 67d2a39f2c
2 changed files with 4 additions and 4 deletions

View File

@ -25,7 +25,7 @@
<elasticsearch.version>1.5.0</elasticsearch.version>
<lucene.maven.version>4.10.4</lucene.maven.version>
<lucene.version>4.10.4</lucene.version>
<shield.version>1.2.1-SNAPSHOT</shield.version>
<shield.version>1.2.1</shield.version>
<license.version>1.0.0</license.version>
<tests.jvms>auto</tests.jvms>

View File

@ -63,17 +63,17 @@ public class ClientProxy implements InitializingService.Initializable {
public BulkResponse bulk(BulkRequest request) {
request.listenerThreaded(true);
return client.bulk(request).actionGet();
return client.bulk(preProcess(request)).actionGet();
}
public void index(IndexRequest request, ActionListener<IndexResponse> listener) {
request.listenerThreaded(true);
client.index(request, listener);
client.index(preProcess(request), listener);
}
public void bulk(BulkRequest request, ActionListener<BulkResponse> listener) {
request.listenerThreaded(true);
client.bulk(request, listener);
client.bulk(preProcess(request), listener);
}
public ActionFuture<DeleteResponse> delete(DeleteRequest request) {