From 330f9418cac14664b2f80e0c2a5a89295d8ec51f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 11 May 2017 15:55:11 +0200 Subject: Starting to get rid of the SINK_DEBUG_AREA --- common/log.h | 8 ++++---- common/storage_lmdb.cpp | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'common') diff --git a/common/log.h b/common/log.h index abb1e55..42193b7 100644 --- a/common/log.h +++ b/common/log.h @@ -102,10 +102,10 @@ static const char *getComponentName() { return nullptr; } #define SinkWarning_(COMPONENT, AREA) SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Warning, AREA, COMPONENT) #define SinkError_(COMPONENT, AREA) SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Error, AREA, COMPONENT) -#define SinkTrace() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Trace, s_sinkDebugArea, getComponentName()) -#define SinkLog() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Log, s_sinkDebugArea, getComponentName()) -#define SinkWarning() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Warning, s_sinkDebugArea, getComponentName()) -#define SinkError() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Error, s_sinkDebugArea, getComponentName()) +#define SinkTrace() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Trace, __FILE__, getComponentName()) +#define SinkLog() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Log, __FILE__, getComponentName()) +#define SinkWarning() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Warning, __FILE__, getComponentName()) +#define SinkError() SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Error, __FILE__, getComponentName()) #define SinkTraceCtx(CTX) SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Trace, CTX.name, nullptr) #define SinkLogCtx(CTX) SINK_DEBUG_STREAM_IMPL(Sink::Log::DebugLevel::Log, CTX.name, nullptr) diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp index ef4bd17..c3240f6 100644 --- a/common/storage_lmdb.cpp +++ b/common/storage_lmdb.cpp @@ -35,9 +35,6 @@ #include #include "log.h" -SINK_DEBUG_AREA("storage") -// SINK_DEBUG_COMPONENT(d->storageRoot.toLatin1() + '/' + d->name.toLatin1()) - namespace Sink { namespace Storage { -- cgit v1.2.3