Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Fix formatting

Browse Source
This commit is contained in:
Gary Gregory
2023-08-22 10:14:54 -04:00
parent 89f104ada2
commit f674d8229e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/commons/logging/LogFactory.java
View File

@@ -526,7 +526,7 @@ public abstract class LogFactory {
try { try {
final InputStream is = getResourceAsStream(contextClassLoader, SERVICE_ID); final InputStream is = getResourceAsStream(contextClassLoader, SERVICE_ID);
if( is != null ) { if ( is != null ) {
// This code is needed by EBCDIC and other strange systems. // This code is needed by EBCDIC and other strange systems.
// It's a fix for bugs reported in xerces // It's a fix for bugs reported in xerces
BufferedReader rd; BufferedReader rd;

6
src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
View File

@@ -73,14 +73,14 @@ public class Jdk13LumberjackLogger implements Log, Serializable {
// --------------------------------------------------------- Public Methods // --------------------------------------------------------- Public Methods
private void log( final Level level, final String msg, final Throwable ex ) { private void log( final Level level, final String msg, final Throwable ex ) {
if( getLogger().isLoggable(level) ) { if ( getLogger().isLoggable(level) ) {
final LogRecord record = new LogRecord(level, msg); final LogRecord record = new LogRecord(level, msg);
if( !classAndMethodFound ) { if ( !classAndMethodFound ) {
getClassAndMethod(); getClassAndMethod();
} }
record.setSourceClassName(sourceClassName); record.setSourceClassName(sourceClassName);
record.setSourceMethodName(sourceMethodName); record.setSourceMethodName(sourceMethodName);
if( ex != null ) { if ( ex != null ) {
record.setThrown(ex); record.setThrown(ex);
} }
getLogger().log(record); getLogger().log(record);

30
src/main/java/org/apache/commons/logging/impl/SimpleLog.java
View File

@@ -177,7 +177,7 @@ public class SimpleLog implements Log, Serializable {
showShortName = getBooleanProperty(systemPrefix + "showShortLogname", showShortName); showShortName = getBooleanProperty(systemPrefix + "showShortLogname", showShortName);
showDateTime = getBooleanProperty(systemPrefix + "showdatetime", showDateTime); showDateTime = getBooleanProperty(systemPrefix + "showdatetime", showDateTime);
if(showDateTime) { if (showDateTime) {
dateTimeFormat = getStringProperty(systemPrefix + "dateTimeFormat", dateTimeFormat = getStringProperty(systemPrefix + "dateTimeFormat",
dateTimeFormat); dateTimeFormat);
try { try {
@@ -223,25 +223,25 @@ public class SimpleLog implements Log, Serializable {
i = String.valueOf(name).lastIndexOf("."); i = String.valueOf(name).lastIndexOf(".");
} }
if(null == lvl) { if (null == lvl) {
lvl = getStringProperty(systemPrefix + "defaultlog"); lvl = getStringProperty(systemPrefix + "defaultlog");
} }
if("all".equalsIgnoreCase(lvl)) { if ("all".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_ALL); setLevel(SimpleLog.LOG_LEVEL_ALL);
} else if("trace".equalsIgnoreCase(lvl)) { } else if ("trace".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_TRACE); setLevel(SimpleLog.LOG_LEVEL_TRACE);
} else if("debug".equalsIgnoreCase(lvl)) { } else if ("debug".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_DEBUG); setLevel(SimpleLog.LOG_LEVEL_DEBUG);
} else if("info".equalsIgnoreCase(lvl)) { } else if ("info".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_INFO); setLevel(SimpleLog.LOG_LEVEL_INFO);
} else if("warn".equalsIgnoreCase(lvl)) { } else if ("warn".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_WARN); setLevel(SimpleLog.LOG_LEVEL_WARN);
} else if("error".equalsIgnoreCase(lvl)) { } else if ("error".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_ERROR); setLevel(SimpleLog.LOG_LEVEL_ERROR);
} else if("fatal".equalsIgnoreCase(lvl)) { } else if ("fatal".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_FATAL); setLevel(SimpleLog.LOG_LEVEL_FATAL);
} else if("off".equalsIgnoreCase(lvl)) { } else if ("off".equalsIgnoreCase(lvl)) {
setLevel(SimpleLog.LOG_LEVEL_OFF); setLevel(SimpleLog.LOG_LEVEL_OFF);
} }
} }
@@ -281,7 +281,7 @@ public class SimpleLog implements Log, Serializable {
final StringBuilder buf = new StringBuilder(); final StringBuilder buf = new StringBuilder();
// Append date-time if so configured // Append date-time if so configured
if(showDateTime) { if (showDateTime) {
final Date now = new Date(); final Date now = new Date();
String dateText; String dateText;
synchronized(dateFormatter) { synchronized(dateFormatter) {
@@ -302,14 +302,14 @@ public class SimpleLog implements Log, Serializable {
} }
// Append the name of the log instance if so configured // Append the name of the log instance if so configured
if(showShortName) { if (showShortName) {
if(shortLogName == null) { if (shortLogName == null) {
// Cut all but the last component of the name for both styles // Cut all but the last component of the name for both styles
final String slName = logName.substring(logName.lastIndexOf(".") + 1); final String slName = logName.substring(logName.lastIndexOf(".") + 1);
shortLogName = slName.substring(slName.lastIndexOf("/") + 1); shortLogName = slName.substring(slName.lastIndexOf("/") + 1);
} }
buf.append(String.valueOf(shortLogName)).append(" - "); buf.append(String.valueOf(shortLogName)).append(" - ");
} else if(showLogName) { } else if (showLogName) {
buf.append(String.valueOf(logName)).append(" - "); buf.append(String.valueOf(logName)).append(" - ");
} }
@@ -317,7 +317,7 @@ public class SimpleLog implements Log, Serializable {
buf.append(String.valueOf(message)); buf.append(String.valueOf(message));
// Append stack trace if not null // Append stack trace if not null
if(t != null) { if (t != null) {
buf.append(" <"); buf.append(" <");
buf.append(t.toString()); buf.append(t.toString());
buf.append(">"); buf.append(">");