Skip to content

Commit 96ca79c

Browse files
author
chilimannen
committed
Updated timeout for commandline imports to 5 minutes from 30s
1 parent e4afa1d commit 96ca79c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/main/java/com/codingchili/ApplicationLauncher.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
import com.codingchili.Model.ParserException;
1515

1616
import io.vertx.core.*;
17+
import io.vertx.core.eventbus.DeliveryOptions;
1718
import io.vertx.core.eventbus.MessageConsumer;
1819

1920
import static com.codingchili.Model.ElasticWriter.ES_STATUS;
21+
import static com.codingchili.Model.ElasticWriter.INDEXING_TIMEOUT;
2022

2123
/**
2224
* @author Robin Duda
@@ -91,7 +93,10 @@ private void importFile(String fileName, String indexName) {
9193
try {
9294
FileParser parser = new FileParser(file.result().getBytes(), 1, fileName);
9395
logger.info(String.format("File parsed, starting import to %s..", indexName));
94-
vertx.eventBus().send(Configuration.INDEXING_ELASTICSEARCH, parser.toImportable(indexName, getMapping()), done -> {
96+
vertx.eventBus().send(Configuration.INDEXING_ELASTICSEARCH,
97+
parser.toImportable(indexName, getMapping()),
98+
new DeliveryOptions().setSendTimeout(INDEXING_TIMEOUT),
99+
done -> {
95100
if (done.succeeded()) {
96101
logger.info("Import completed, shutting down.");
97102
} else {

src/main/java/com/codingchili/Controller/Website.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.logging.Level;
2222
import java.util.logging.Logger;
2323

24+
import static com.codingchili.Model.ElasticWriter.INDEXING_TIMEOUT;
2425
import static com.codingchili.Model.FileParser.INDEX;
2526

2627
/**
@@ -30,7 +31,6 @@
3031
*/
3132
public class Website extends AbstractVerticle {
3233
public static final String MAPPING = "mapping";
33-
private static final int INDEXING_TIMEOUT = 300000;
3434
private Logger logger = Logger.getLogger(getClass().getName());
3535
private static final String DONE = "/done";
3636
private static final String ERROR = "/error";

src/main/java/com/codingchili/Model/ElasticWriter.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* Writes json data to elasticsearch for indexing.
1717
*/
1818
public class ElasticWriter extends AbstractVerticle {
19+
public static final int INDEXING_TIMEOUT = 300000;
1920
private static final String INDEX = "index";
2021
private static final String BULK = "/_bulk";
2122
private static final int POLL = 5000;

0 commit comments

Comments
 (0)