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

added fix for TRI_ENABLE_LOGGING from Jan

This commit is contained in:
Frank Celler 2013-02-16 14:03:35 +01:00
parent 9836f3f349
commit ced7b05cca
7 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/V8Server/v8-vocbase.cpp
View File

@ -2867,7 +2867,10 @@ static v8::Handle<v8::Value> JS_UpgradeVocbaseCol (v8::Arguments const& argv) {
}
TRI_collection_t* col = &primary->base;
#ifdef TRI_ENABLE_LOGGER
const char* name = col->_info._name;
#endif
TRI_col_version_t version = col->_info._version;
if (version >= 3) {

4
arangod/VocBase/document-collection.c
View File

@ -1427,6 +1427,8 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil
key = ((char*) d) + d->_offsetKey;
}
else {
#ifdef TRI_ENABLE_LOGGER
TRI_doc_edge_key_marker_t const* e = (TRI_doc_edge_key_marker_t const*) marker;
LOG_TRACE("edge: fid %lu, key %s, fromKey %s, toKey %s, rid %llu, _offsetJson %lu, _offsetKey %lu",
@ -1437,7 +1439,7 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil
(unsigned long long) d->_rid,
(unsigned long) d->_offsetJson,
(unsigned long) d->_offsetKey);
#endif
markerSize = sizeof(TRI_doc_edge_key_marker_t);
key = ((char*) d) + d->_offsetKey;
}

2
build_posix.h
View File

@ -1 +1 @@
#define TRIAGENS_VERSION "1.2.beta2"
#define TRIAGENS_VERSION "1.3.alpha"

11
lib/BasicsC/logging.h
View File

@ -301,10 +301,10 @@ void TRI_FreeBufferLogging (TRI_vector_t* buffer);
/// @brief logs fatal errors
////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_LOGGER
void CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR (void);
#ifdef TRI_ENABLE_LOGGER
#define LOG_FATAL_AND_EXIT(...) \
do { \
LOG_ARG_CHECK(__VA_ARGS__) \
@ -316,6 +316,13 @@ void CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR (void);
#else
#define LOG_FATAL_AND_EXIT(...) \
do { \
fprintf(stderr, "fatal error. exiting.\n"); \
CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR(); \
} while (0)
#define LOG_FATAL(...) while (0)
#endif

5
lib/Dispatcher/Dispatcher.cpp
View File

@ -251,8 +251,9 @@ void Dispatcher::reportStatus () {
MUTEX_LOCKER(_accessDispatcher);
for (map<string, DispatcherQueue*>::iterator i = _queues.begin(); i != _queues.end(); ++i) {
string const& name = i->first;
DispatcherQueue* q = i->second;
#ifdef TRI_ENABLE_LOGGER
string const& name = i->first;
LOGGER_DEBUG("dispatcher queue '" << name << "': "
<< "threads = " << q->_nrThreads << " "
@ -281,7 +282,7 @@ void Dispatcher::reportStatus () {
<< LoggerData::Extra("monopilizer")
<< LoggerData::Extra((q->_monopolizer ? "1" : "0"))
<< "dispatcher status");
#endif
CONDITION_LOCKER(guard, q->_accessQueue);
for (set<DispatcherThread*>::iterator j = q->_startedThreads.begin(); j != q->_startedThreads.end(); ++j) {

2
lib/HttpServer/ApplicationEndpointServer.cpp
View File

@ -457,10 +457,12 @@ bool ApplicationEndpointServer::createSslContext () {
X509_NAME_print_ex(bout._bio, cert, 0, (XN_FLAG_SEP_COMMA_PLUS | XN_FLAG_DN_REV | ASN1_STRFLGS_UTF8_CONVERT) & ~ASN1_STRFLGS_ESC_MSB);
#ifdef TRI_ENABLE_LOGGER
char* r;
long len = BIO_get_mem_data(bout._bio, &r);
LOGGER_TRACE("name: " << string(r, len));
#endif
}
}
}

6
lib/Logger/Logger.h
View File

@ -68,7 +68,11 @@
#else
#define LOGGER_FATAL_AND_EXIT(a) \
CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR()
do { \
fprintf(stderr, "fatal error. exiting.\n"); \
CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR(); \
} \
while (0)
#endif