Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 11:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one

Browse Source 
- Use log4j2 placeholder for logging messages and optimize logging a bit
This commit is contained in:
Johannes Geppert
2015-05-25 21:25:50 +02:00
parent 95805e54f7
commit 8e8771153a
91 changed files with 416 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java8-support/src/main/java/org/apache/struts2/convention/Java8ClassFinder.java
+13 -23
View File
@@ -93,8 +93,7 @@ public class Java8ClassFinder implements ClassFinder {
}
}
} catch (Exception e) {
if (LOG.isErrorEnabled())
LOG.error("Unable to read URL [#0]", e, location.toExternalForm());
LOG.error("Unable to read URL [{}]", location.toExternalForm(), e);
}
}
@@ -103,8 +102,7 @@ public class Java8ClassFinder implements ClassFinder {
if (classNameFilter.test(className))
readClassDef(className);
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Unable to read class [#0]", e, className);
LOG.error("Unable to read class [{}]", className, e);
}
}
}
@@ -197,8 +195,7 @@ public class Java8ClassFinder implements ClassFinder {
classes.add(clazz);
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -228,8 +225,7 @@ public class Java8ClassFinder implements ClassFinder {
}
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -259,8 +255,7 @@ public class Java8ClassFinder implements ClassFinder {
}
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -290,8 +285,7 @@ public class Java8ClassFinder implements ClassFinder {
}
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -310,8 +304,7 @@ public class Java8ClassFinder implements ClassFinder {
classes.add(classInfo.get());
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -327,8 +320,7 @@ public class Java8ClassFinder implements ClassFinder {
classes.add(classInfo.get());
}
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -342,8 +334,7 @@ public class Java8ClassFinder implements ClassFinder {
try {
classes.add(classInfo.get());
} catch (Throwable e) {
if (LOG.isErrorEnabled())
LOG.error("Error loading class [#0]", e, classInfo.getName());
LOG.error("Error loading class [{}]", classInfo.getName(), e);
classesNotLoaded.add(classInfo.getName());
}
}
@@ -360,8 +351,7 @@ public class Java8ClassFinder implements ClassFinder {
urls.add(url);
}
} catch (IOException ioe) {
if (LOG.isErrorEnabled())
LOG.error("Could not read driectory [#0]", ioe, dirName);
LOG.error("Could not read directory [{}]", dirName, ioe);
}
}
@@ -405,9 +395,9 @@ public class Java8ClassFinder implements ClassFinder {
} finally {
in.close();
}
} else if (LOG.isDebugEnabled())
LOG.debug("Unable to read [#0]", location.toExternalForm());
} else {
LOG.debug("Unable to read [{}]", location.toExternalForm());
}
return Collections.emptyList();
}