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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2016-09-09 14:31:20 +02:00
parent 1085642b50 0d2a1e6298
commit 5800a2901d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/GeneralServer/VppCommTask.cpp
View File

@ -236,7 +236,7 @@ bool VppCommTask::processRead() {
// handle request types // handle request types
if (type == 1000) { if (type == 1000) {
// do authentication // do authentication
std::string encryption = header.at(2).copyString(); // std::string encryption = header.at(2).copyString();
std::string user = header.at(3).copyString(); std::string user = header.at(3).copyString();
std::string pass = header.at(4).copyString(); std::string pass = header.at(4).copyString();
auto auth = basics::StringUtils::encodeBase64(user + ":" + pass); auto auth = basics::StringUtils::encodeBase64(user + ":" + pass);
@ -367,6 +367,7 @@ void VppCommTask::handleSimpleError(rest::ResponseCode responseCode,
boost::optional<bool> VppCommTask::getMessageFromSingleChunk( boost::optional<bool> VppCommTask::getMessageFromSingleChunk(
ChunkHeader const& chunkHeader, VppInputMessage& message, bool& doExecute, ChunkHeader const& chunkHeader, VppInputMessage& message, bool& doExecute,
char const* vpackBegin, char const* chunkEnd) { char const* vpackBegin, char const* chunkEnd) {
// add agent for this new message
_agents.emplace( _agents.emplace(
std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true))); std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true)));
@ -414,6 +415,7 @@ boost::optional<bool> VppCommTask::getMessageFromMultiChunks(
// CASE 2a: chunk starts new message // CASE 2a: chunk starts new message
if (chunkHeader._isFirst) { // first chunk of multi chunk message if (chunkHeader._isFirst) { // first chunk of multi chunk message
// add agent for this new message
_agents.emplace( _agents.emplace(
std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true))); std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true)));
@ -449,6 +451,7 @@ boost::optional<bool> VppCommTask::getMessageFromMultiChunks(
// CASE 2b: chunk continues a message // CASE 2b: chunk continues a message
} else { // followup chunk of some mesage } else { // followup chunk of some mesage
// do not add agent for this continued message
LOG_TOPIC(DEBUG, Logger::COMMUNICATION) << "VppCommTask: " LOG_TOPIC(DEBUG, Logger::COMMUNICATION) << "VppCommTask: "
<< "chunk continues a message"; << "chunk continues a message";
if (incompleteMessageItr == _incompleteMessages.end()) { if (incompleteMessageItr == _incompleteMessages.end()) {