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

* Logging:

Browse Source 
- Require strict match of class name component
   - parseLimits() cleanup
This commit is contained in:
zzz
2013-10-05 13:07:33 +00:00
parent 887017b54c
commit c2fa2d0c5b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,12 @@ class LogLimit {
public boolean matches(Log log) {
String name = log.getName();
if (name == null) return false;
return name.startsWith(_rootName);
//return name.startsWith(_rootName);
// exact match or higher in class hierarchy
// no longer allow foo.bar to match foo.barf
return name.startsWith(_rootName) &&
(name.length() == _rootName.length() ||
name.charAt(_rootName.length()) == '.');
}
@Override

8
core/java/src/net/i2p/util/LogManager.java
View File

@ -15,9 +15,9 @@ import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Queue;
import java.util.Set;
@ -406,9 +406,8 @@ public class LogManager {
private void parseLimits(Properties config, String recordPrefix) {
_limits.clear();
if (config != null) {
for (Iterator iter = config.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next();
String val = config.getProperty(key);
for (Map.Entry e : config.entrySet()) {
String key = (String) e.getKey();
// if we're filtering the records (e.g. logger.record.*) then
// filter accordingly (stripping off that prefix for matches)
@ -420,6 +419,7 @@ public class LogManager {
}
}
String val = (String) e.getValue();
LogLimit lim = new LogLimit(key, Log.getLevel(val));
//_log.debug("Limit found for " + name + " as " + val);
if (!_limits.contains(lim))