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

fixed merge conflict

This commit is contained in:
Frank Celler 2016-02-24 18:47:27 +01:00
parent 6e851249e3
commit df0fe99d5e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Cluster/HeartbeatThread.cpp
View File

@ -267,7 +267,7 @@ void HeartbeatThread::runCoordinator() {
setReady(); setReady();
while (!_stop) { while (!isStopping()) {
LOG(TRACE) << "sending heartbeat to agency"; LOG(TRACE) << "sending heartbeat to agency";
double const start = TRI_microtime(); double const start = TRI_microtime();
@ -276,7 +276,7 @@ void HeartbeatThread::runCoordinator() {
// we don't care if this fails // we don't care if this fails
sendState(); sendState();
if (_stop) { if (isStopping()) {
break; break;
} }
@ -290,7 +290,7 @@ void HeartbeatThread::runCoordinator() {
} }
} }
if (_stop) { if (isStopping()) {
break; break;
} }
@ -379,10 +379,6 @@ void HeartbeatThread::runCoordinator() {
} }
} }
// another thread is waiting for this value to appear in order to shut down
// properly
_stop = 2;
LOG(TRACE) << "stopped heartbeat thread"; LOG(TRACE) << "stopped heartbeat thread";
} }