Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed error messages in simplehttpclient

This commit is contained in:
Jan Steemann 2013-01-15 18:33:07 +01:00
parent ead3f2f204
commit 0686cfdbd0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SimpleHttpClient/ClientConnection.cpp
View File

@ -175,10 +175,20 @@ bool ClientConnection::prepare (const double timeout, const bool isWrite) const
readFds = &fdset; readFds = &fdset;
} }
if (select(_socket + 1, readFds, writeFds, NULL, &tv) > 0) { int res = select(_socket + 1, readFds, writeFds, NULL, &tv);
if (res > 0) {
return true; return true;
} }
if (res == 0) {
if (isWrite) {
TRI_set_errno(TRI_SIMPLE_CLIENT_COULD_NOT_WRITE);
}
else {
TRI_set_errno(TRI_SIMPLE_CLIENT_COULD_NOT_READ);
}
}
return false; return false;
} }
@ -187,7 +197,7 @@ bool ClientConnection::prepare (const double timeout, const bool isWrite) const
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool ClientConnection::writeClientConnection (void* buffer, size_t length, size_t* bytesWritten) { bool ClientConnection::writeClientConnection (void* buffer, size_t length, size_t* bytesWritten) {
if (!checkSocket()) { if (! checkSocket()) {
return false; return false;
} }
@ -212,7 +222,7 @@ bool ClientConnection::writeClientConnection (void* buffer, size_t length, size_
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool ClientConnection::readClientConnection (StringBuffer& stringBuffer) { bool ClientConnection::readClientConnection (StringBuffer& stringBuffer) {
if (!checkSocket()) { if (! checkSocket()) {
return false; return false;
} }
@ -221,7 +231,7 @@ bool ClientConnection::readClientConnection (StringBuffer& stringBuffer) {
do { do {
char buffer[READBUFFER_SIZE]; char buffer[READBUFFER_SIZE];
int lenRead = TRI_READ_SOCKET(_socket, buffer, READBUFFER_SIZE - 1,0); int lenRead = TRI_READ_SOCKET(_socket, buffer, READBUFFER_SIZE - 1, 0);
if (lenRead == -1) { if (lenRead == -1) {
// error occurred // error occurred

4
lib/SimpleHttpClient/SimpleHttpClient.cpp
View File

@ -89,7 +89,7 @@ namespace triagens {
TRI_set_errno(TRI_ERROR_NO_ERROR); TRI_set_errno(TRI_ERROR_NO_ERROR);
if (! _connection->handleWrite(remainingTime, (void*) (_writeBuffer.c_str() + _written), _writeBuffer.length() - _written, &bytesWritten)) { if (! _connection->handleWrite(remainingTime, (void*) (_writeBuffer.c_str() + _written), _writeBuffer.length() - _written, &bytesWritten)) {
setErrorMessage("Couldn't send data to server", errno); setErrorMessage(TRI_last_error(), false);
this->close(); this->close();
} }
else { else {
@ -125,7 +125,7 @@ namespace triagens {
} }
} }
else { else {
setErrorMessage("Couldn't read data from server", errno); setErrorMessage(TRI_last_error(), false);
this->close(); this->close();
} }
break; break;