mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-13 01:07:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored LogManager instance methods into LoggerRegistry

Browse Source 
LogManager was having method name conflicts
LogManager delegates static methods to a LoggerRegistry instance
This commit is contained in:
Collin Smith
2020-08-27 04:28:04 -07:00
parent c4839f5e7e
commit 7f79bbbc9a
2 changed files with 103 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
core/src/com/riiablo/logger/LogManager.java
View File

@ -1,105 +1,19 @@
package com.riiablo.logger; package com.riiablo.logger;
import java.util.SortedMap;
import org.apache.commons.collections4.Trie;
import org.apache.commons.collections4.trie.PatriciaTrie;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
public class LogManager { public class LogManager {
private static final LogManager INSTANCE = new LogManager(); public static final LoggerRegistry INSTANCE = new LoggerRegistry();
private static final char PACKAGE_SEPARATOR = ClassUtils.PACKAGE_SEPARATOR_CHAR;
public static final String ROOT = StringUtils.EMPTY; public static final String ROOT = StringUtils.EMPTY;
// public static Logger getLogger(Class<?> clazz) { public static Logger getLogger(Class<?> clazz) {
// return INSTANCE.get(clazz); return INSTANCE.getLogger(clazz);
// }
//
// public static Logger getLogger(String name) {
// return INSTANCE.get(name);
// }
LogManager() {}
private final Trie<String, Logger> loggers = new PatriciaTrie<>();
private final Trie<String, Level> contexts = new PatriciaTrie<>();
private final Logger ROOT_LOGGER = createRootLogger();
private Logger createRootLogger() {
final Logger root = new Logger(ROOT);
root.level(Level.WARN);
loggers.put(ROOT, root);
contexts.put(ROOT, root.level());
return root;
} }
public Logger getRoot() { public static Logger getLogger(String name) {
return ROOT_LOGGER; return INSTANCE.getLogger(name);
} }
public Logger getLogger(Class<?> clazz) { private LogManager() {}
return getLogger(clazz.getCanonicalName());
}
public Logger getLogger(String name) {
if (ROOT_LOGGER.appender() == null) {
throw new IllegalStateException("Cannot initialize logger without ROOT appender set!");
}
Logger logger = loggers.get(name);
if (logger == null) {
loggers.put(name, logger = new Logger(name));
logger.addAppender(ROOT_LOGGER.appender());
final Level context = resolve(logger.name());
logger.bind(context, true);
}
return logger;
}
public Level getLevel(String name) {
return resolve(name);
}
Level resolve(String name) {
Level context = contexts.get(name);
if (context != null) return context;
for (int i = name.length();
(i = StringUtils.lastIndexOf(name, PACKAGE_SEPARATOR, i - 1)) != -1; ) {
context = contexts.get(name.substring(0, i));
if (context != null) return context;
}
assert contexts.get(ROOT) == ROOT_LOGGER.level();
return ROOT_LOGGER.level();
}
public void setLevel(String name, Level level) {
setLevel(name, level, false);
}
public void setLevel(String name, Level level, boolean force) {
bind(name, level, force);
bindAll(name, level, force);
}
void bind(String name, Level context, boolean force) {
contexts.put(name, context);
final Logger logger = loggers.get(name);
if (logger != null) logger.bind(context, force);
}
void bindAll(String pkg, Level context, boolean force) {
pkg = StringUtils.appendIfMissing(pkg, String.valueOf(PACKAGE_SEPARATOR));
for (SortedMap.Entry<String, Level> entry
: contexts.prefixMap(pkg).entrySet()) {
entry.setValue(context);
}
for (Logger logger
: loggers.prefixMap(pkg).values()) {
logger.bind(context, force);
}
}
} }

97
core/src/com/riiablo/logger/LoggerRegistry.java Normal file
View File

@ -0,0 +1,97 @@
package com.riiablo.logger;
import java.util.SortedMap;
import org.apache.commons.collections4.Trie;
import org.apache.commons.collections4.trie.PatriciaTrie;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
public class LoggerRegistry {
private static final char PACKAGE_SEPARATOR = ClassUtils.PACKAGE_SEPARATOR_CHAR;
public static final String ROOT = LogManager.ROOT;
LoggerRegistry() {}
private final Trie<String, Logger> loggers = new PatriciaTrie<>();
private final Trie<String, Level> contexts = new PatriciaTrie<>();
private final Logger ROOT_LOGGER = createRootLogger();
private Logger createRootLogger() {
final Logger root = new Logger(ROOT);
root.level(Level.WARN);
root.addAppender(new OutputStreamAppender(System.out));
loggers.put(ROOT, root);
contexts.put(ROOT, root.level());
return root;
}
public Logger getRoot() {
return ROOT_LOGGER;
}
public Logger getLogger(Class<?> clazz) {
return getLogger(clazz.getCanonicalName());
}
public Logger getLogger(String name) {
if (ROOT_LOGGER.appender() == null) {
throw new IllegalStateException("Cannot initialize logger without ROOT appender set!");
}
Logger logger = loggers.get(name);
if (logger == null) {
loggers.put(name, logger = new Logger(name));
logger.addAppender(ROOT_LOGGER.appender());
final Level context = resolve(logger.name());
logger.bind(context, true);
}
return logger;
}
public Level getLevel(String name) {
return resolve(name);
}
Level resolve(String name) {
Level context = contexts.get(name);
if (context != null) return context;
for (int i = name.length();
(i = StringUtils.lastIndexOf(name, PACKAGE_SEPARATOR, i - 1)) != -1; ) {
context = contexts.get(name.substring(0, i));
if (context != null) return context;
}
assert contexts.get(ROOT) == ROOT_LOGGER.level();
return ROOT_LOGGER.level();
}
public void setLevel(String name, Level level) {
setLevel(name, level, false);
}
public void setLevel(String name, Level level, boolean force) {
bind(name, level, force);
bindAll(name, level, force);
}
void bind(String name, Level context, boolean force) {
contexts.put(name, context);
final Logger logger = loggers.get(name);
if (logger != null) logger.bind(context, force);
}
void bindAll(String pkg, Level context, boolean force) {
pkg = StringUtils.appendIfMissing(pkg, String.valueOf(PACKAGE_SEPARATOR));
for (SortedMap.Entry<String, Level> entry
: contexts.prefixMap(pkg).entrySet()) {
entry.setValue(context);
}
for (Logger logger
: loggers.prefixMap(pkg).values()) {
logger.bind(context, force);
}
}
}