|
|
@ -24,41 +24,41 @@ final class Log4jLogger extends Logger { |
|
|
|
|
|
|
|
|
|
|
|
private static final long serialVersionUID = -5446154366955151335L; |
|
|
|
private static final long serialVersionUID = -5446154366955151335L; |
|
|
|
|
|
|
|
|
|
|
|
private final org.apache.log4j.Logger logger; |
|
|
|
private final com.fr.third.apache.log4j.Logger logger; |
|
|
|
|
|
|
|
|
|
|
|
Log4jLogger(final String name) { |
|
|
|
Log4jLogger(final String name) { |
|
|
|
super(name); |
|
|
|
super(name); |
|
|
|
logger = org.apache.log4j.Logger.getLogger(name); |
|
|
|
logger = com.fr.third.apache.log4j.Logger.getLogger(name); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public boolean isEnabled(final Level level) { |
|
|
|
public boolean isEnabled(final Level level) { |
|
|
|
final org.apache.log4j.Level l = translate(level); |
|
|
|
final com.fr.third.apache.log4j.Level l = translate(level); |
|
|
|
return logger.isEnabledFor(l) && l.isGreaterOrEqual(logger.getEffectiveLevel()); |
|
|
|
return logger.isEnabledFor(l) && l.isGreaterOrEqual(logger.getEffectiveLevel()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { |
|
|
|
protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { |
|
|
|
final org.apache.log4j.Level translatedLevel = translate(level); |
|
|
|
final com.fr.third.apache.log4j.Level translatedLevel = translate(level); |
|
|
|
if (logger.isEnabledFor(translatedLevel)) try { |
|
|
|
if (logger.isEnabledFor(translatedLevel)) try { |
|
|
|
logger.log(loggerClassName, translatedLevel, parameters == null || parameters.length == 0 ? message : MessageFormat.format(String.valueOf(message), parameters), thrown); |
|
|
|
logger.log(loggerClassName, translatedLevel, parameters == null || parameters.length == 0 ? message : MessageFormat.format(String.valueOf(message), parameters), thrown); |
|
|
|
} catch (Throwable ignored) {} |
|
|
|
} catch (Throwable ignored) {} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { |
|
|
|
protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { |
|
|
|
final org.apache.log4j.Level translatedLevel = translate(level); |
|
|
|
final com.fr.third.apache.log4j.Level translatedLevel = translate(level); |
|
|
|
if (logger.isEnabledFor(translatedLevel)) try { |
|
|
|
if (logger.isEnabledFor(translatedLevel)) try { |
|
|
|
logger.log(loggerClassName, translatedLevel, parameters == null ? String.format(format) : String.format(format, parameters), thrown); |
|
|
|
logger.log(loggerClassName, translatedLevel, parameters == null ? String.format(format) : String.format(format, parameters), thrown); |
|
|
|
} catch (Throwable ignored) {} |
|
|
|
} catch (Throwable ignored) {} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static org.apache.log4j.Level translate(final Level level) { |
|
|
|
private static com.fr.third.apache.log4j.Level translate(final Level level) { |
|
|
|
if (level != null) switch (level) { |
|
|
|
if (level != null) switch (level) { |
|
|
|
case FATAL: return org.apache.log4j.Level.FATAL; |
|
|
|
case FATAL: return com.fr.third.apache.log4j.Level.FATAL; |
|
|
|
case ERROR: return org.apache.log4j.Level.ERROR; |
|
|
|
case ERROR: return com.fr.third.apache.log4j.Level.ERROR; |
|
|
|
case WARN: return org.apache.log4j.Level.WARN; |
|
|
|
case WARN: return com.fr.third.apache.log4j.Level.WARN; |
|
|
|
case INFO: return org.apache.log4j.Level.INFO; |
|
|
|
case INFO: return com.fr.third.apache.log4j.Level.INFO; |
|
|
|
case DEBUG: return org.apache.log4j.Level.DEBUG; |
|
|
|
case DEBUG: return com.fr.third.apache.log4j.Level.DEBUG; |
|
|
|
case TRACE: return org.apache.log4j.Level.TRACE; |
|
|
|
case TRACE: return com.fr.third.apache.log4j.Level.TRACE; |
|
|
|
} |
|
|
|
} |
|
|
|
return org.apache.log4j.Level.ALL; |
|
|
|
return com.fr.third.apache.log4j.Level.ALL; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|