From ced7b05cca3fab3130dfb2b6f81b2c9834e13a4e Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Sat, 16 Feb 2013 14:03:35 +0100
Subject: [PATCH] added fix for TRI_ENABLE_LOGGING from Jan

---
 arangod/V8Server/v8-vocbase.cpp              |  3 +++
 arangod/VocBase/document-collection.c        |  4 +++-
 build_posix.h                                |  2 +-
 lib/BasicsC/logging.h                        | 11 +++++++++--
 lib/Dispatcher/Dispatcher.cpp                |  5 +++--
 lib/HttpServer/ApplicationEndpointServer.cpp |  2 ++
 lib/Logger/Logger.h                          |  6 +++++-
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp
index 67a74a3daf..6b9b8e4749 100644
--- a/arangod/V8Server/v8-vocbase.cpp
+++ b/arangod/V8Server/v8-vocbase.cpp
@@ -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) {
diff --git a/arangod/VocBase/document-collection.c b/arangod/VocBase/document-collection.c
index 68c6122488..6361a4fd74 100644
--- a/arangod/VocBase/document-collection.c
+++ b/arangod/VocBase/document-collection.c
@@ -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;
     }
diff --git a/build_posix.h b/build_posix.h
index 67ba811e24..0aa331688f 100644
--- a/build_posix.h
+++ b/build_posix.h
@@ -1 +1 @@
-#define TRIAGENS_VERSION "1.2.beta2"
+#define TRIAGENS_VERSION "1.3.alpha"
diff --git a/lib/BasicsC/logging.h b/lib/BasicsC/logging.h
index 33f7055215..935a3e168e 100644
--- a/lib/BasicsC/logging.h
+++ b/lib/BasicsC/logging.h
@@ -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
diff --git a/lib/Dispatcher/Dispatcher.cpp b/lib/Dispatcher/Dispatcher.cpp
index 861e7ec918..697426a08e 100644
--- a/lib/Dispatcher/Dispatcher.cpp
+++ b/lib/Dispatcher/Dispatcher.cpp
@@ -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) {
diff --git a/lib/HttpServer/ApplicationEndpointServer.cpp b/lib/HttpServer/ApplicationEndpointServer.cpp
index 75d8612bf3..b47089ac31 100644
--- a/lib/HttpServer/ApplicationEndpointServer.cpp
+++ b/lib/HttpServer/ApplicationEndpointServer.cpp
@@ -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          
         }
       }
     }
diff --git a/lib/Logger/Logger.h b/lib/Logger/Logger.h
index e238c60386..9e0c743cfe 100644
--- a/lib/Logger/Logger.h
+++ b/lib/Logger/Logger.h
@@ -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