From f6fdcece0bb1a886ebc77ae19391ec53ab8afd3d Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 19 Apr 2016 08:05:23 +0200 Subject: [PATCH] fixed order fiasco --- lib/Logger/LogTopic.cpp | 14 ++++++++++++++ lib/Logger/Logger.cpp | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Logger/LogTopic.cpp b/lib/Logger/LogTopic.cpp index 3cf15ddee8..7aea3532c1 100644 --- a/lib/Logger/LogTopic.cpp +++ b/lib/Logger/LogTopic.cpp @@ -36,6 +36,20 @@ std::atomic NEXT_TOPIC_ID(0); Mutex LogTopic::_namesLock; std::map LogTopic::_names; +LogTopic Logger::AGENCY("agency", LogLevel::INFO); +LogTopic Logger::COLLECTOR("collector"); +LogTopic Logger::COMPACTOR("compactor"); +LogTopic Logger::CONFIG("config"); +LogTopic Logger::DATAFILES("datafiles", LogLevel::INFO); +LogTopic Logger::MMAP("mmap"); +LogTopic Logger::PERFORMANCE("performance", LogLevel::FATAL); // suppress +LogTopic Logger::QUERIES("queries", LogLevel::INFO); +LogTopic Logger::REPLICATION("replication", LogLevel::INFO); +LogTopic Logger::REQUESTS("requests", LogLevel::FATAL); // suppress +LogTopic Logger::STARTUP("startup", LogLevel::INFO); +LogTopic Logger::THREADS("threads", LogLevel::WARN); +LogTopic Logger::V8("v8", LogLevel::WARN); + std::vector> LogTopic::logLevelTopics() { std::vector> levels; diff --git a/lib/Logger/Logger.cpp b/lib/Logger/Logger.cpp index 0f4aa36d48..840d9d1e00 100644 --- a/lib/Logger/Logger.cpp +++ b/lib/Logger/Logger.cpp @@ -49,20 +49,6 @@ std::string Logger::_outputPrefix(""); std::unique_ptr Logger::_loggingThread(nullptr); -LogTopic Logger::AGENCY("agency", LogLevel::INFO); -LogTopic Logger::COLLECTOR("collector"); -LogTopic Logger::COMPACTOR("compactor"); -LogTopic Logger::CONFIG("config"); -LogTopic Logger::DATAFILES("datafiles", LogLevel::INFO); -LogTopic Logger::MMAP("mmap"); -LogTopic Logger::PERFORMANCE("performance", LogLevel::FATAL); // suppress -LogTopic Logger::QUERIES("queries", LogLevel::INFO); -LogTopic Logger::REPLICATION("replication", LogLevel::INFO); -LogTopic Logger::REQUESTS("requests", LogLevel::FATAL); // suppress -LogTopic Logger::STARTUP("startup", LogLevel::INFO); -LogTopic Logger::THREADS("threads", LogLevel::WARN); -LogTopic Logger::V8("v8", LogLevel::WARN); - LogLevel Logger::logLevel() { return _level.load(std::memory_order_relaxed); } std::vector> Logger::logLevelTopics() {