From bbf70c6032fcfccfec4b35703afd7271a8c8e9d8 Mon Sep 17 00:00:00 2001 From: yDelouis Date: Mon, 10 Mar 2014 15:41:12 +0100 Subject: [PATCH] Don't log 'Resolve log file' if log level is higher --- .../logger/LoggerContext.java | 21 ++++++++--------- .../logger/appender/FileAppender.java | 23 +++++++++++-------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java index 5ce570a079..3ade0be75e 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java @@ -15,13 +15,6 @@ */ package org.androidannotations.logger; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.Element; - import org.androidannotations.helper.OptionsHelper; import org.androidannotations.logger.appender.Appender; import org.androidannotations.logger.appender.ConsoleAppender; @@ -29,6 +22,12 @@ import org.androidannotations.logger.appender.MessagerAppender; import org.androidannotations.logger.formatter.Formatter; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import java.util.ArrayList; +import java.util.List; + public class LoggerContext { private static LoggerContext INSTANCE = null; @@ -70,14 +69,14 @@ public void setCurrentLevel(Level currentLevel) { } public void setProcessingEnv(ProcessingEnvironment processingEnv) { + OptionsHelper optionsHelper = new OptionsHelper(processingEnv); + resolveLogLevel(optionsHelper); + addConsoleAppender(optionsHelper); + for (Appender appender : appenders) { appender.setProcessingEnv(processingEnv); appender.open(); } - - OptionsHelper optionsHelper = new OptionsHelper(processingEnv); - resolveLogLevel(optionsHelper); - addConsoleAppender(optionsHelper); } public void close() { diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java index 921382d5ac..542f8a1a8e 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java @@ -15,20 +15,20 @@ */ package org.androidannotations.logger.appender; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; +import org.androidannotations.helper.FileHelper; +import org.androidannotations.logger.Level; +import org.androidannotations.logger.LoggerContext; +import org.androidannotations.logger.formatter.FormatterFull; import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.tools.Diagnostic.Kind; - -import org.androidannotations.helper.FileHelper; -import org.androidannotations.logger.Level; -import org.androidannotations.logger.formatter.FormatterFull; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; public class FileAppender extends Appender { @@ -91,10 +91,13 @@ private void resolveLogFile() { file = resolveLogFileInParentsDirectories(); } + Level logLevel = LoggerContext.getInstance().getCurrentLevel(); Messager messager = processingEnv.getMessager(); if (file == null) { - messager.printMessage(Kind.WARNING, "Can't resolve log file"); - } else { + if (Level.WARN.isGreaterOrEquals(logLevel)) { + messager.printMessage(Kind.WARNING, "Can't resolve log file"); + } + } else if (Level.INFO.isGreaterOrEquals(logLevel)) { messager.printMessage(Kind.NOTE, "Resolve log file to " + file.getAbsolutePath()); } }