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

mini fixes

This commit is contained in:
jsteemann 2017-01-26 10:49:42 +01:00
parent 6ec875bf92
commit 34a110a08b
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/GeneralServer/HttpCommTask.cpp
View File

@ -68,7 +68,6 @@ HttpCommTask::HttpCommTask(EventLoop loop, GeneralServer* server,
connectionStatisticsAgentSetHttp(); connectionStatisticsAgentSetHttp();
auto agent = std::make_unique<RequestStatisticsAgent>(true); auto agent = std::make_unique<RequestStatisticsAgent>(true);
agent->acquire();
MUTEX_LOCKER(lock, _agentsMutex); MUTEX_LOCKER(lock, _agentsMutex);
_agents.emplace(std::make_pair(1UL, std::move(agent))); _agents.emplace(std::make_pair(1UL, std::move(agent)));
} }
@ -264,11 +263,11 @@ bool HttpCommTask::processRead(double startTime) {
return false; return false;
} }
if (std::strncmp(_readBuffer.c_str(), "VST/1.0\r\n\r\n", 11) == 0) { if (_readBuffer.length() >= 11 && std::memcmp(_readBuffer.c_str(), "VST/1.0\r\n\r\n", 11) == 0) {
LOG_TOPIC(TRACE, Logger::COMMUNICATION) << "Switching from Http to Vst"; LOG_TOPIC(TRACE, Logger::COMMUNICATION) << "switching from HTTP to VST";
std::shared_ptr<GeneralCommTask> commTask;
_abandoned = true; _abandoned = true;
cancelKeepAlive(); cancelKeepAlive();
std::shared_ptr<GeneralCommTask> commTask;
commTask = std::make_shared<VppCommTask>( commTask = std::make_shared<VppCommTask>(
_loop, _server, std::move(_peer), std::move(_connectionInfo), _loop, _server, std::move(_peer), std::move(_connectionInfo),
GeneralServerFeature::keepAliveTimeout(), /*skipSocketInit*/ true); GeneralServerFeature::keepAliveTimeout(), /*skipSocketInit*/ true);
@ -286,8 +285,8 @@ bool HttpCommTask::processRead(double startTime) {
char const* sptr = _readBuffer.c_str() + _startPosition; char const* sptr = _readBuffer.c_str() + _startPosition;
size_t slen = _readPosition - _startPosition; size_t slen = _readPosition - _startPosition;
if (slen == 11 && memcmp(sptr, "VST/1.1", 7) == 0) { if (slen == 11 && std::memcmp(sptr, "VST/1.1\r\n\r\n", 11) == 0) {
LOG(WARN) << "got VelocyStream request on HTTP port"; LOG(WARN) << "got VST request on HTTP port";
return false; return false;
} }

2
arangod/Scheduler/SocketTask.cpp
View File

@ -22,8 +22,6 @@
/// @author Jan Christoph Uhde /// @author Jan Christoph Uhde
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//#define DEBUG_STATISTICS
#include "SocketTask.h" #include "SocketTask.h"
#include "Basics/MutexLocker.h" #include "Basics/MutexLocker.h"

2
arangod/Scheduler/SocketTask.h
View File

@ -74,7 +74,7 @@ class SocketTask : virtual public Task, public ConnectionStatisticsAgent {
protected: protected:
void addWriteBuffer(std::unique_ptr<basics::StringBuffer> buffer) { void addWriteBuffer(std::unique_ptr<basics::StringBuffer> buffer) {
addWriteBuffer(std::move(buffer), (RequestStatisticsAgent*)nullptr); addWriteBuffer(std::move(buffer), nullptr);
} }
void addWriteBuffer(std::unique_ptr<basics::StringBuffer>, void addWriteBuffer(std::unique_ptr<basics::StringBuffer>,