locusworks/app-logger
4
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Updated libraries to fix vulnerabilities

Browse Source
This commit is contained in:
Isaac Parenteau
2022-09-18 22:23:00 -05:00
parent 211196aca9
commit df50805038
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
.settings/ .settings/
target/ target/
bin/ bin/
.idea

12
pom.xml
View File

@ -20,8 +20,8 @@
<main.basedir>${project.basedir}</main.basedir> <main.basedir>${project.basedir}</main.basedir>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<log4j.version>2.14.1</log4j.version> <log4j.version>2.19.0</log4j.version>
<slf4j.version>1.7.32</slf4j.version> <slf4j.version>2.0.1</slf4j.version>
<nexus.repo>https://nexus.locusworks.net</nexus.repo> <nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties> </properties>
@ -30,7 +30,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version> <version>3.0.0-M7</version>
<configuration> <configuration>
<forkMode>always</forkMode> <forkMode>always</forkMode>
</configuration> </configuration>
@ -51,7 +51,7 @@
<plugin> <plugin>
<groupId>org.owasp</groupId> <groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>6.3.1</version> <version>7.2.0</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -63,7 +63,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
<executions> <executions>
<execution> <execution>
<id>enforce</id> <id>enforce</id>
@ -153,4 +153,4 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>

16
src/main/java/net/locusworks/logger/ApplicationLogger.java
View File

@ -17,7 +17,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
private static final Logger logger = LoggerFactory.getLogger(ApplicationLogger.class); private static final Logger logger = LoggerFactory.getLogger(ApplicationLogger.class);
private String name; private final String name;
private LogLevel level; private LogLevel level;
@ -471,7 +471,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
public void error(Map<String, String> values, String valueFormat, StringBuilder sb, Throwable e) { public void error(Map<String, String> values, String valueFormat, StringBuilder sb, Throwable e) {
msgHelper(LogLevel.ERROR, values, valueFormat, sb); msgHelper(LogLevel.ERROR, values, valueFormat, sb);
if (e != null) { if (e != null) {
msgHelper(LogLevel.ERROR, "", e); msgHelper("", e);
} }
} }
@ -588,7 +588,7 @@ public class ApplicationLogger implements org.slf4j.Logger {
values.entrySet() values.entrySet()
.stream() .stream()
.map(entry -> String.format(format, entry.getKey(), entry.getValue())) .map(entry -> String.format(format, entry.getKey(), entry.getValue()))
.forEach(s -> builder.append(s)); .forEach(builder::append);
log(level, builder.toString()); log(level, builder.toString());
} }
@ -605,13 +605,13 @@ public class ApplicationLogger implements org.slf4j.Logger {
/** /**
* helper method to format a message for logging * helper method to format a message for logging
* @param level log level to use *
* @param message message to log * @param message message to log
* @param e any throwable to log * @param e any throwable to log
*/ */
private void msgHelper(LogLevel level, String message, Throwable e) { private void msgHelper(String message, Throwable e) {
String msg = e == null ? String.format("%n%s", message) : String.format("%n%s%n%s%n%s", message, e.getMessage(), getStackTrace(e)); String msg = e == null ? String.format("%n%s", message) : String.format("%n%s%n%s%n%s", message, e.getMessage(), getStackTrace(e));
log(level, msg); log(LogLevel.ERROR, msg);
} }
/** /**
@ -622,4 +622,4 @@ public class ApplicationLogger implements org.slf4j.Logger {
private String format(String message, LogLevel level) { private String format(String message, LogLevel level) {
return String.format("th%06d [%-5s] [%s] %s", Thread.currentThread().getId(), level, this.name, message); return String.format("th%06d [%-5s] [%s] %s", Thread.currentThread().getId(), level, this.name, message);
} }
} }

4
src/main/java/net/locusworks/logger/ApplicationLoggerFactory.java
View File

@ -20,7 +20,7 @@ public class ApplicationLoggerFactory {
* Need to get the log level from the properties file. * Need to get the log level from the properties file.
* Would normally use the configuration service but would create a circular dependency as * Would normally use the configuration service but would create a circular dependency as
* the configuration service use the ApplicationLoggerFactory to create a logger * the configuration service use the ApplicationLoggerFactory to create a logger
* @param initializer The initializer * @param init The initializer
*/ */
public static void init(ApplicationLoggerInitializer init) { public static void init(ApplicationLoggerInitializer init) {
initializer = init; initializer = init;
@ -214,4 +214,4 @@ public class ApplicationLoggerFactory {
this.level = level; this.level = level;
} }
} }
} }