]> source.dussan.org Git - sonarqube.git/commitdiff
Fix bad merge
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 4 Dec 2014 22:50:10 +0000 (23:50 +0100)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 4 Dec 2014 22:50:10 +0000 (23:50 +0100)
server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java

index 350b74fac71a48f90755b934ed87c1b8aaea781d..e3ffdc5ab207d7c515bde8cf083a3494114963a8 100644 (file)
@@ -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");
   }