develop #15

Merged
iparenteau merged 7 commits from develop into master 2022-09-18 22:50:58 -05:00
5 changed files with 18 additions and 17 deletions

1
.gitignore vendored
View File

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

2
Jenkinsfile vendored
View File

@ -183,4 +183,4 @@ def SetVersion( v ) {
}
}
return this
return this

16
pom.xml
View File

@ -9,7 +9,7 @@
<description>Logger library for applications</description>
<scm>
<url>https://gitea.locusworks.net/locusworks/app-logger.git</url>
<url>ssh://gitea@gitea.locusworks.net:7999/locusworks/app-logger.git</url>
</scm>
<organization>
<name>locusworks</name>
@ -20,8 +20,8 @@
<main.basedir>${project.basedir}</main.basedir>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<log4j.version>2.17.2</log4j.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<slf4j.version>2.0.1</slf4j.version>
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties>
@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
<configuration>
<forkMode>always</forkMode>
</configuration>
@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.0</version>
<version>3.10.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@ -51,7 +51,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>7.0.0</version>
<version>7.2.0</version>
<executions>
<execution>
<goals>
@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>enforce</id>
@ -153,4 +153,4 @@
</pluginRepository>
</pluginRepositories>
</project>
</project>

View File

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

View File

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