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

slightly simplify logging

This commit is contained in:
jsteemann 2017-03-29 01:16:55 +02:00
parent f8a01fae54
commit d4752433f0
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/MMFiles/MMFilesDatafile.cpp
View File

@ -329,7 +329,7 @@ MMFilesDatafile* MMFilesDatafile::create(std::string const& filename, TRI_voc_fi
// sanity check maximal size // sanity check maximal size
if (sizeof(MMFilesDatafileHeaderMarker) + sizeof(MMFilesDatafileFooterMarker) > if (sizeof(MMFilesDatafileHeaderMarker) + sizeof(MMFilesDatafileFooterMarker) >
maximalSize) { maximalSize) {
LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "cannot create datafile, maximal size '" << (unsigned int)maximalSize << "' is too small"; LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "cannot create datafile, maximal size '" << maximalSize << "' is too small";
TRI_set_errno(TRI_ERROR_ARANGO_MAXIMAL_SIZE_TOO_SMALL); TRI_set_errno(TRI_ERROR_ARANGO_MAXIMAL_SIZE_TOO_SMALL);
return nullptr; return nullptr;

5
arangod/MMFiles/MMFilesLogfileManager.cpp
View File

@ -1288,7 +1288,7 @@ int MMFilesLogfileManager::getWriteableLogfile(uint32_t size,
// found a logfile, update the status variable and return the logfile // found a logfile, update the status variable and return the logfile
{ {
// LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "setting lastOpenedId " << // logfile->id(); // LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "setting lastOpenedId " << logfile->id();
MUTEX_LOCKER(mutexLocker, _idLock); MUTEX_LOCKER(mutexLocker, _idLock);
_lastOpenedId = logfile->id(); _lastOpenedId = logfile->id();
} }
@ -1485,8 +1485,7 @@ void MMFilesLogfileManager::setCollectionDone(MMFilesWalLogfile* logfile) {
TRI_ASSERT(logfile != nullptr); TRI_ASSERT(logfile != nullptr);
MMFilesWalLogfile::IdType id = logfile->id(); MMFilesWalLogfile::IdType id = logfile->id();
// LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "setCollectionDone setting lastCollectedId to " << (unsigned // LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "setCollectionDone setting lastCollectedId to " << id
// long long) id;
{ {
WRITE_LOCKER(writeLocker, _logfilesLock); WRITE_LOCKER(writeLocker, _logfilesLock);
logfile->setStatus(MMFilesWalLogfile::StatusType::COLLECTED); logfile->setStatus(MMFilesWalLogfile::StatusType::COLLECTED);

2
lib/Random/RandomGenerator.cpp
View File

@ -316,7 +316,7 @@ class RandomDeviceCombined : public RandomDevice {
rseed = buffer[0]; rseed = buffer[0];
LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "using seed " << (long unsigned int)rseed; LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "using seed " << rseed;
} }
if (0 < n) { if (0 < n) {