Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Don't log 'Resolve log file' if log level is higher #993

Merged
DayS merged 1 commit into from
May 11, 2014
Merged

Don't log 'Resolve log file' if log level is higher #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions ...tations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@
*/
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;
import org.androidannotations.logger.appender.FileAppender;
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;
Expand Down Expand Up @@ -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() {
Expand Down
23 changes: 13 additions & 10 deletions ...androidannotations/src/main/java/org/androidannotations/logger/appender/FileAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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());
}
}
Expand Down