Skip to content

Commit 8d6702c

Browse files
yDelouisyDelouis
committed
Merge pull request androidannotations#1110 from WonderCsabo/fileAppenderOptional
FileAppender in LoggerContext is optional
2 parents 695c89e + 87ac006 commit 8d6702c

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/OptionsHelper.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ enum Option {
3232
RESOURCE_PACKAGE_NAME("resourcePackageName", null), //
3333
LOG_FILE("logFile", null), //
3434
LOG_LEVEL("logLevel", "DEBUG"), //
35-
LOG_APPENDER_CONSOLE("logAppenderConsole", "false");
35+
LOG_APPENDER_CONSOLE("logAppenderConsole", "false"), //
36+
LOG_APPENDER_FILE("logAppenderFile", "true");
3637

3738
private String key;
3839
private String defaultValue;
@@ -97,6 +98,10 @@ public boolean shouldUseConsoleAppender() {
9798
return getBoolean(Option.LOG_APPENDER_CONSOLE);
9899
}
99100

101+
public boolean shouldUseFileAppender() {
102+
return getBoolean(Option.LOG_APPENDER_FILE);
103+
}
104+
100105
private String getString(Option option) {
101106
String key = option.getKey();
102107
if (options.containsKey(key)) {

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/logger/LoggerContext.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
*/
1616
package org.androidannotations.logger;
1717

18+
import java.util.ArrayList;
19+
import java.util.List;
20+
21+
import javax.annotation.processing.ProcessingEnvironment;
22+
import javax.lang.model.element.AnnotationMirror;
23+
import javax.lang.model.element.Element;
24+
1825
import org.androidannotations.helper.OptionsHelper;
1926
import org.androidannotations.logger.appender.Appender;
2027
import org.androidannotations.logger.appender.ConsoleAppender;
2128
import org.androidannotations.logger.appender.FileAppender;
2229
import org.androidannotations.logger.appender.MessagerAppender;
2330
import org.androidannotations.logger.formatter.Formatter;
2431

25-
import javax.annotation.processing.ProcessingEnvironment;
26-
import javax.lang.model.element.AnnotationMirror;
27-
import javax.lang.model.element.Element;
28-
import java.util.ArrayList;
29-
import java.util.List;
30-
3132
public class LoggerContext {
3233

3334
private static LoggerContext INSTANCE = null;
@@ -48,7 +49,6 @@ public static LoggerContext getInstance() {
4849
}
4950

5051
LoggerContext() {
51-
appenders.add(new FileAppender());
5252
appenders.add(new MessagerAppender());
5353
}
5454

@@ -72,6 +72,7 @@ public void setProcessingEnv(ProcessingEnvironment processingEnv) {
7272
OptionsHelper optionsHelper = new OptionsHelper(processingEnv);
7373
resolveLogLevel(optionsHelper);
7474
addConsoleAppender(optionsHelper);
75+
addFileAppender(optionsHelper);
7576

7677
for (Appender appender : appenders) {
7778
appender.setProcessingEnv(processingEnv);
@@ -95,4 +96,10 @@ private void addConsoleAppender(OptionsHelper optionsHelper) {
9596
}
9697
}
9798

99+
private void addFileAppender(OptionsHelper optionsHelper) {
100+
if (optionsHelper.shouldUseFileAppender()) {
101+
appenders.add(new FileAppender());
102+
}
103+
}
104+
98105
}

0 commit comments

Comments
 (0)