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

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

This commit is contained in:
Andreas Streichardt 2016-02-24 17:01:12 +01:00
parent dbc71272be 15865ccae4
commit c69696bc85
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Basics/Logger.cpp
View File

@ -291,7 +291,9 @@ void LogAppenderFile::reopenLog() {
int old = std::atomic_exchange(&_fd, fd); int old = std::atomic_exchange(&_fd, fd);
TRI_CLOSE(old); if (old > STDERR_FILENO) {
TRI_CLOSE(old);
}
} }
void LogAppenderFile::closeLog() { void LogAppenderFile::closeLog() {

3
scripts/startLocalCluster.sh
View File

@ -156,6 +156,9 @@ testServer() {
done done
} }
for p in `seq 8629 $PORTTOPDB` ; do
testServer $p
done
for p in `seq 8530 $PORTTOPCO` ; do for p in `seq 8530 $PORTTOPCO` ; do
testServer $p testServer $p
done done