Skip to content

Commit 173a73d

Browse files
committed
Set loglevel specified in the properties file
Fixes #48 Signed-off-by: Bernd Hufmann <[email protected]>
1 parent 5b90c8e commit 173a73d

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/main/java/org/eclipse/tracecompass/traceeventlogger/AsyncFileHandler.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,14 @@
8686
* </ul>
8787
*/
8888
public class AsyncFileHandler extends StreamHandler {
89+
private static final int DEFAULT_FLUSH_RATE = 1000;
8990
private static final LogRecord CLOSE_EVENT = new LogRecord(Level.FINEST, "CLOSE_EVENT"); //$NON-NLS-1$
9091
private FileHandler fFileHandler;
9192
private BlockingQueue<List<LogRecord>> fQueue;
9293
private Thread fWriterThread;
9394
private int fMaxSize = 1024;
9495
private int fQueueDepth = 10000;
95-
private int fFlushRate = 1000;
96+
private int fFlushRate = DEFAULT_FLUSH_RATE;
9697
private String fEncoding;
9798
private Filter fFilter;
9899
private ErrorManager fErrorManager;
@@ -134,7 +135,6 @@ private void configure() {
134135
if (fQueueDepth < 0) {
135136
fQueueDepth = 10000;
136137
}
137-
fFlushRate = 1000;
138138
prop = manager.getProperty(cname + ".formatter"); //$NON-NLS-1$
139139
try {
140140
fFormatter = (Formatter) ClassLoader.getSystemClassLoader().loadClass(prop).getDeclaredConstructor().newInstance();
@@ -155,14 +155,22 @@ private void configure() {
155155
// we tried!
156156
}
157157

158+
prop = manager.getProperty(cname + ".level"); //$NON-NLS-1$
159+
try {
160+
setLevel(Level.parse(prop));
161+
} catch (Exception e) {
162+
// we tried!
163+
}
164+
158165
prop = manager.getProperty(cname + ".flushRate"); //$NON-NLS-1$
159166
try {
160167
fFlushRate = Integer.parseInt(prop.trim());
161168
} catch (Exception ex) {
162169
// we tried!
163170
}
171+
164172
if (fFlushRate < 0) {
165-
fFlushRate = 1000;
173+
fFlushRate = DEFAULT_FLUSH_RATE;
166174
}
167175
}
168176

src/test/java/org/eclipse/tracecompass/traceeventlogger/AsyncFileHandlerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void testGoodConfigure() {
8585
LogManager manager = LogManager.getLogManager();
8686
manager.readConfiguration(fis);
8787
Handler first = new AsyncFileHandler(File.createTempFile("test", ".json").getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
88+
assertEquals(Level.FINER, first.getLevel());
8889
first.close();
8990
} catch (FileNotFoundException e) {
9091
fail(e.getMessage());

src/test/java/org/eclipse/tracecompass/traceeventlogger/res/goodlogging.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.flushRate = 100
3535
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.formatter = java.util.logging.SimpleFormatter
3636
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.filter = org.eclipse.tracecompass.traceeventlogger.FailFilter
3737
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.encoding = UTF-8
38-
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.errormanager = java.util.logging.ErrorManager
38+
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.errormanager = java.util.logging.ErrorManager
39+
org.eclipse.tracecompass.traceeventlogger.AsyncFileHandler.level = FINER

0 commit comments

Comments
 (0)