diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-12-04 23:50:10 +0100 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-12-04 23:50:10 +0100 |
commit | 3d26c6db600561ccfa0b8b6563ce80f56bfd033c (patch) | |
tree | 3fefa0d00ab23bf6bbe376260bdfd3424a8575d1 /server | |
parent | b08f9808b49c04c9153ff3096cef73170ea232a6 (diff) | |
download | sonarqube-3d26c6db600561ccfa0b8b6563ce80f56bfd033c.tar.gz sonarqube-3d26c6db600561ccfa0b8b6563ce80f56bfd033c.zip |
Fix bad merge
Diffstat (limited to 'server')
-rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java index 350b74fac71..e3ffdc5ab20 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java @@ -32,6 +32,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.picocontainer.Startable; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.server.util.ProgressLogger; @@ -66,8 +67,7 @@ public class BulkIndexer implements Startable { public BulkIndexer(EsClient client, String indexName) { this.client = client; this.indexName = indexName; - this.progress = new ProgressLogger(String.format("Progress[BulkIndexer[%s]]", indexName), counter, - LoggerFactory.getLogger(BulkIndexer.class)) + this.progress = new ProgressLogger(String.format("Progress[BulkIndexer[%s]]", indexName), counter, LOGGER) .setPluralLabel("requests"); } |