maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Rashid Khan 2013-12-30 15:14:44 -07:00
parent 5d4b0e959c 2f45c9638e
commit 801fa66fad
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
exporter/src/main/java/org/elasticsearch/marvel/monitor/exporter/ESExporter.java
View file

@ -432,8 +432,8 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
return false;
}
boolean hasDoc = conn.getResponseCode() == 200;
conn.getInputStream().close(); // close and release to connection pool.
boolean hasDoc;
hasDoc = conn.getResponseCode() == 200;
// nothing there, lets create it
if (!hasDoc) {
@ -464,8 +464,8 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
try {
return checkAndUpload("_template/marvel", template);
} catch (IOException e) {
logger.error("error when checking/adding index template", e);
return false;
// if we're not sure of the template, we can't send data... re-raise exception.
throw new ElasticSearchException("failed to load/verify index template", e);
}
}