tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7027 from Icinga/feature/es-improve-error-handling 

Elasticsearch: Improve error handling/logging
This commit is contained in:
Michael Friedrich 2019-03-19 08:35:16 +01:00 committed by GitHub
parent 6ace8001d8 816a935b3d
commit 9f91ab98b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/perfdata/elasticsearchwriter.cpp
View File

@ -512,15 +512,13 @@ void ElasticsearchWriter::SendRequest(const String& body)
return; return;
} }
Log(LogWarning, "ElasticsearchWriter") std::ostringstream msgbuf;
<< "Unexpected response code " << resp.StatusCode; msgbuf << "Unexpected response code " << resp.StatusCode << " from URL '" << req.RequestUrl->Format() << "'";
String contentType = resp.Headers->Get("content-type"); String contentType = resp.Headers->Get("content-type");
if (contentType != "application/json") { if (contentType != "application/json" && contentType != "application/json; charset=utf-8") {
Log(LogWarning, "ElasticsearchWriter") msgbuf << "; Unexpected Content-Type: '" << contentType << "'";
<< "Unexpected Content-Type: " << contentType;
return;
} }
size_t responseSize = resp.GetBodySize(); size_t responseSize = resp.GetBodySize();
@ -528,6 +526,11 @@ void ElasticsearchWriter::SendRequest(const String& body)
resp.ReadBody(buffer.get(), responseSize); resp.ReadBody(buffer.get(), responseSize);
buffer.get()[responseSize] = '\0'; buffer.get()[responseSize] = '\0';
#ifdef I2_DEBUG
msgbuf << "; Response body: '" << buffer.get() << "'";
#endif /* I2_DEBUG */
/* {"statusCode":404,"error":"Not Found","message":"Not Found"} */
Dictionary::Ptr jsonResponse; Dictionary::Ptr jsonResponse;
try { try {
jsonResponse = JsonDecode(buffer.get()); jsonResponse = JsonDecode(buffer.get());
@ -540,7 +543,7 @@ void ElasticsearchWriter::SendRequest(const String& body)
String error = jsonResponse->Get("error"); String error = jsonResponse->Get("error");
Log(LogCritical, "ElasticsearchWriter") Log(LogCritical, "ElasticsearchWriter")
<< "Elasticsearch error message:\n" << error; << "Error: '" << error << "'. " << msgbuf.str();
return; return;
} }