From 163f3238ce41a6a59aee7a10809d6e5eaed42f1c Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Thu, 1 Dec 2016 16:13:25 +0100 Subject: [PATCH] logic: Prevent verbose indexer logging when logging is disabled --- src/lib_cxx/data/parser/cxx/ASTConsumer.cpp | 2 +- src/lib_java/data/parser/java/JavaParser.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp index 0290f237..7607fe65 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp @@ -5,7 +5,7 @@ ASTConsumer::ASTConsumer(clang::ASTContext* context, clang::Preprocessor* preprocessor, ParserClient* client, FileRegister* fileRegister) { - if (ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled()) + if (ApplicationSettings::getInstance()->getLoggingEnabled() && ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled()) { m_visitor = std::make_shared(context, preprocessor, client, fileRegister); } diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp index 8858aed7..4c172582 100644 --- a/src/lib_java/data/parser/java/JavaParser.cpp +++ b/src/lib_java/data/parser/java/JavaParser.cpp @@ -77,6 +77,9 @@ void JavaParser::parseFile(const FilePath& filePath, std::shared_ptr // remove tabs because they screw with javaparser's location resolver std::string fileContent = utility::replace(textAccess->getText(), "\t", " "); + int verbose = ApplicationSettings::getInstance()->getLoggingEnabled() && + ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled() ? 1 : 0; + m_javaEnvironment->callStaticVoidMethod( "io/coati/JavaIndexer", "processFile", @@ -84,7 +87,7 @@ void JavaParser::parseFile(const FilePath& filePath, std::shared_ptr filePath.str(), fileContent, classPath, - ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled() ? 1 : 0 + verbose ); } }