echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include priority for logged strings

Browse Source
This commit is contained in:
str4d
2015-03-04 19:07:28 +00:00
parent b92e1ee9aa
commit 9b73fcda40
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/src/net/i2p/util/LogWriter.java
View File

@ -47,10 +47,10 @@ class LogWriter extends LogWriterBase {
} }
protected void writeRecord(LogRecord rec, String formatted) { protected void writeRecord(LogRecord rec, String formatted) {
writeRecord(formatted); writeRecord(rec.getPriority(), formatted);
} }
protected synchronized void writeRecord(String val) { protected synchronized void writeRecord(int priority, String val) {
if (val == null) return; if (val == null) return;
if (_currentOut == null) { if (_currentOut == null) {
rotateFile(); rotateFile();

7
core/java/src/net/i2p/util/LogWriterBase.java
View File

@ -45,9 +45,10 @@ abstract class LogWriterBase implements Runnable {
protected abstract void writeRecord(LogRecord rec, String formatted); protected abstract void writeRecord(LogRecord rec, String formatted);
/** /**
* Write a single String verbatim to the writer. * Write a single String verbatim to the writer.
* @param priority the level to log the line at.
* @param line the String to write. * @param line the String to write.
*/ */
protected abstract void writeRecord(String line); protected abstract void writeRecord(int priority, String line);
protected abstract void flushWriter(); protected abstract void flushWriter();
protected abstract void closeWriter(); protected abstract void closeWriter();
@ -95,7 +96,7 @@ abstract class LogWriterBase implements Runnable {
dupCount++; dupCount++;
} else { } else {
if (dupCount > 0) { if (dupCount > 0) {
writeRecord(dupMessage(dupCount, _last, false)); writeRecord(_last.getPriority(), dupMessage(dupCount, _last, false));
_manager.getBuffer().add(dupMessage(dupCount, _last, true)); _manager.getBuffer().add(dupMessage(dupCount, _last, true));
dupCount = 0; dupCount = 0;
} }
@ -104,7 +105,7 @@ abstract class LogWriterBase implements Runnable {
_last = rec; _last = rec;
} }
if (dupCount > 0) { if (dupCount > 0) {
writeRecord(dupMessage(dupCount, _last, false)); writeRecord(_last.getPriority(), dupMessage(dupCount, _last, false));
_manager.getBuffer().add(dupMessage(dupCount, _last, true)); _manager.getBuffer().add(dupMessage(dupCount, _last, true));
} }
flushWriter(); flushWriter();