Skip to content

tried to print error in savebackup #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cielavenir wants to merge 6 commits into
base: master
Choose a base branch
from
Open

tried to print error in savebackup #57

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2da9ea7
tried to print error in savebackup
Jul 25, 2019
5f23300
Merge remote-tracking branch 'origin/master' into savebackup_printerror
Sep 2, 2019
73bfd29
fixed Windows compilcation
Sep 2, 2019
6ce39e7
refix
Sep 2, 2019
2a1b382
moved _CallGet ostream callback outside of function
Sep 6, 2019
3391dae
Merge branch 'master' into savebackup_printerror
Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/controllerclientimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,15 +607,33 @@ int ControllerClientImpl::_CallGet(const std::string& desturi, std::ostream& out
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_TIMEOUT_MS, 0L, (long)(timeout * 1000L));
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_HTTPHEADER, NULL, _httpheadersjson);
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_URL, NULL, desturi.c_str());
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_WRITEFUNCTION, NULL, _WriteOStreamCallback);
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_WRITEDATA, NULL, &outputStream);
_buffer.clear();
_buffer.str("");
struct scallback{
Comment thread
cielavenir marked this conversation as resolved.
Outdated
static size_t callback(char *data, size_t size, size_t nmemb, void **writerData){
if(((std::stringstream*)writerData[0])->tellg() < 0x1000) {
_WriteStringStreamCallback(data, size, nmemb, (std::stringstream*)writerData[0]);
}
return _WriteOStreamCallback(data, size, nmemb, (std::ostream*)writerData[1]);
}
};
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_WRITEFUNCTION, NULL, scallback::callback);
void *writerData[]={&_buffer,&outputStream};
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_WRITEDATA, NULL, writerData);
CURL_OPTION_SAVE_SETTER(_curl, CURLOPT_HTTPGET, 0L, 1L);
CURL_PERFORM(_curl);
long http_code = 0;
CURL_INFO_GETTER(_curl, CURLINFO_RESPONSE_CODE, &http_code);
std::string outputdata = _buffer.str();
if( expectedhttpcode != 0 && http_code != expectedhttpcode ) {
// outputStream is not always seekable; ignore any error message.
throw MUJIN_EXCEPTION_FORMAT("HTTP GET to '%s' returned HTTP status %s (outputStream might have information)", desturi%http_code, MEC_HTTPServer);
if( outputdata.size() > 0 ) {
rapidjson::Document d;
ParseJson(d, _buffer.str());
Comment thread
cielavenir marked this conversation as resolved.
std::string error_message = GetJsonValueByKey<std::string>(d, "error_message");
std::string traceback = GetJsonValueByKey<std::string>(d, "traceback");
throw MUJIN_EXCEPTION_FORMAT("HTTP GET to '%s' returned HTTP status %s: %s", desturi%http_code%error_message, MEC_HTTPServer);
}
throw MUJIN_EXCEPTION_FORMAT("HTTP GET to '%s' returned HTTP status %s", desturi%http_code, MEC_HTTPServer);
}
return http_code;
}
Expand Down