From 30c29f1a530552f0493fe11ba82f94d6d03fde1c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 19 May 2017 09:43:16 -0700 Subject: [PATCH] Moved to Log4J 2. --- .gitignore | 2 +- .idea/modules/mobibot.iml | 83 ++++++------- README.md | 2 +- build.gradle | 25 ++-- kobalt/Build.kt.iml | 15 ++- kobalt/src/Build.kt | 23 ++-- mobibot.ipr | 111 +++++++----------- properties/log4j.properties | 15 --- properties/log4j2.xml | 16 +++ .../net/thauvin/erik/mobibot/ReleaseInfo.java | 6 +- .../net/thauvin/erik/mobibot/Mobibot.java | 17 +-- .../thauvin/erik/mobibot/TellMessagesMgr.java | 6 +- version.properties | 6 +- 13 files changed, 149 insertions(+), 178 deletions(-) delete mode 100644 properties/log4j.properties create mode 100644 properties/log4j2.xml diff --git a/.gitignore b/.gitignore index 49d96ef..c6fa7ef 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ /gen /gradle.properties /local.properties -/log4j.properties +/log4j2.xml /logs /mobibot.properties /out diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml index 0856423..3014ce4 100644 --- a/.idea/modules/mobibot.iml +++ b/.idea/modules/mobibot.iml @@ -1,5 +1,5 @@ - + @@ -17,41 +17,28 @@ - - - - - - - - - - - - - - - - + + - - - - + - - - + + + + - + + + - + + @@ -61,24 +48,26 @@ - + + - - - - + - - - + + + - + + + - + + + @@ -88,24 +77,26 @@ - + + - - - - + - - - + + + - + + + - + + + diff --git a/README.md b/README.md index 989b506..5dedce8 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Some very basic instructions: cd deploy { configure the properties } - vi *.properties + vi *.properties *.xml { help } java -jar mobibot.jar -h diff --git a/build.gradle b/build.gradle index 502bc00..edacab1 100644 --- a/build.gradle +++ b/build.gradle @@ -49,29 +49,28 @@ repositories { } dependencies { - compile 'log4j:log4j:1.2.17@jar' - compile 'pircbot:pircbot:1.5.0' + + compile 'org.apache.logging.log4j:log4j-api:2.8.2' + compile 'org.apache.logging.log4j:log4j-core:2.8.2' - //compile 'commons-codec:commons-codec:1.10' - compile 'commons-logging:commons-logging:1.2' - compile 'commons-net:commons-net:3.6' compile 'commons-cli:commons-cli:1.4' + + compile 'commons-net:commons-net:3.6' compile 'com.squareup.okhttp3:okhttp:3.8.0' - - compile 'oro:oro:2.0.8' - - compile 'org.jsoup:jsoup:1.10.2' + compile 'com.rometools:rome:1.7.3' - compile 'org.slf4j:slf4j-log4j12:1.7.25' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2' + compile 'org.json:json:20170516' compile 'org.ostermiller:utils:1.07.00' - + compile 'org.jsoup:jsoup:1.10.2' compile 'net.objecthunter:exp4j:0.4.8' compile 'org.twitter4j:twitter4j-core:4.0.6' compile 'net.thauvin.erik:pinboard-poster:0.9.1' + // https://bitbucket.org/akapribot/owm-japis compile files('lib/owm-japis-2.5.0.5.jar') compileOnly semverJar @@ -113,9 +112,7 @@ task wrapper(type: Wrapper) { } task copyToDeploy(type: Copy) { - from('properties') { - include '*.properties' - } + from('properties') from jar into deployDir } diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml index 7cf6bc1..580d86e 100644 --- a/kobalt/Build.kt.iml +++ b/kobalt/Build.kt.iml @@ -10,13 +10,22 @@ - + - + + + + + + + + + + - + diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 4eed577..14b107e 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -15,6 +15,7 @@ import java.util.* val bs = buildScript { repos(localMaven()) + plugins("net.thauvin.erik:kobalt-versioneye:") } val mainClassName = "net.thauvin.erik.mobibot.Mobibot" @@ -52,29 +53,27 @@ val p = project { val lib = "lib" dependencies { - compile("log4j:log4j:jar:1.2.17") - compile("pircbot:pircbot:1.5.0") - //compile("commons-codec:commons-codec:1.10") - compile("commons-logging:commons-logging:1.2") - compile("commons-net:commons-net:3.6") + compile("org.apache.logging.log4j:log4j-api:2.8.2") + compile("org.apache.logging.log4j:log4j-core:2.8.2") + compile("commons-cli:commons-cli:1.4") + + compile("commons-net:commons-net:3.6") compile("com.squareup.okhttp3:okhttp:3.8.0") - compile("oro:oro:2.0.8") + compile("com.rometools:rome:1.7.3", "org.apache.logging.log4j:log4j-slf4j-impl:jar:2.8.2") - compile("org.jsoup:jsoup:1.10.2") - compile("com.rometools:rome:1.7.3") - compile("org.slf4j:slf4j-log4j12:1.7.25") compile("org.json:json:20170516") compile("org.ostermiller:utils:1.07.00") - + compile("org.jsoup:jsoup:1.10.2") compile("net.objecthunter:exp4j:0.4.8") compile("org.twitter4j:twitter4j-core:4.0.6") compile("net.thauvin.erik:pinboard-poster:0.9.1") + // https://bitbucket.org/akapribot/owm-japis/ compile(file("lib/owm-japis-2.5.0.5.jar")) apt(processorJar) @@ -98,7 +97,6 @@ val p = project { attributes("Main-Class", mainClassName) attributes("Class-Path", collect(compileDependencies) - .filter { !it.file.name.startsWith("junit") } .map { it.file.name } .joinToString(" ./$lib/", prefix = ". ./$lib/")) } @@ -113,9 +111,8 @@ val p = project { install { target = deploy include(from("kobaltBuild/libs"), to(target), glob("**/*")) - include(from("properties"), to(target), glob("**/*.properties")) + include(from("properties"), to(target), glob("**/*")) collect(compileDependencies) - .filter { !it.file.name.startsWith("junit") } .forEach { copy(from(it.file.absolutePath), to("$target/$lib")) } diff --git a/mobibot.ipr b/mobibot.ipr index df5896c..6196e9a 100644 --- a/mobibot.ipr +++ b/mobibot.ipr @@ -339,22 +339,22 @@ - + - + - + - + - + - + @@ -384,33 +384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -420,15 +393,6 @@ - - - - - - - - - @@ -438,13 +402,13 @@ - + - + - + @@ -456,6 +420,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -483,13 +474,13 @@ - + - + - + @@ -510,22 +501,13 @@ - + - + - - - - - - - - - - + @@ -537,15 +519,6 @@ - - - - - - - - - diff --git a/properties/log4j.properties b/properties/log4j.properties deleted file mode 100644 index 78b2948..0000000 --- a/properties/log4j.properties +++ /dev/null @@ -1,15 +0,0 @@ -log4j.rootLogger=FATAL, stderr - -# Standard Error Console Appender -log4j.appender.stderr=org.apache.log4j.ConsoleAppender -log4j.appender.stderr.layout=org.apache.log4j.PatternLayout -#log4j.appender.stderr.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.appender.stderr.layout.ConversionPattern=%d [%p] %c %x %m%n -log4j.appender.stderr.target=System.err - -# Print only messages of priority FATAL or above in the package org.apache.commons.httpclient -log4j.logger.org.apache.commons.httpclient=FATAL -log4j.logger.httpclient.wire=FATAL - -# Print only messages of priority FATAL or above in the package net.thauvin.erik.mobibot -log4j.category.net.thauvin.erik.mobibot=FATAL diff --git a/properties/log4j2.xml b/properties/log4j2.xml new file mode 100644 index 0000000..6c658d9 --- /dev/null +++ b/properties/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index 7115878..5e7dd9d 100644 --- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -18,12 +18,12 @@ public final class ReleaseInfo { public final static String PROJECT = "mobibot"; public final static LocalDateTime BUILDDATE = - LocalDateTime.ofInstant(Instant.ofEpochMilli(1495067438992L), ZoneId.systemDefault()); + LocalDateTime.ofInstant(Instant.ofEpochMilli(1495210914271L), ZoneId.systemDefault()); public final static int MAJOR = 0; public final static int MINOR = 7; - public final static int PATCH = 1; + public final static int PATCH = 2; public final static String PRERELEASE = "beta"; - public final static String BUILDMETA = "021"; + public final static String BUILDMETA = "022"; /** * The full version string. diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java index 7227054..74060b5 100644 --- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java +++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java @@ -35,8 +35,10 @@ import com.rometools.rome.io.FeedException; import net.thauvin.erik.mobibot.modules.*; import net.thauvin.erik.semver.Version; import org.apache.commons.cli.*; -import org.apache.commons.logging.impl.Log4JLogger; -import org.apache.log4j.Level; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import org.jibble.pircbot.PircBot; import org.jibble.pircbot.User; import org.jsoup.Jsoup; @@ -150,7 +152,7 @@ public class Mobibot extends PircBot { private final String ircServer; // The logger. - private final Log4JLogger logger = new Log4JLogger(Mobibot.class.getPackage().getName()); + private final Logger logger = LogManager.getLogger(Mobibot.class); // The logger default level. private final Level loggerLevel; @@ -208,7 +210,7 @@ public class Mobibot extends PircBot { this.logsDir = logsDir; // Set the logger level - loggerLevel = logger.getLogger().getLevel(); + loggerLevel = logger.getLevel(); // Load the current entries, if any. try { @@ -527,7 +529,7 @@ public class Mobibot extends PircBot { * * @return The bot's logger. */ - public final Log4JLogger getLogger() { + public final Logger getLogger() { return logger; } @@ -1399,9 +1401,10 @@ public class Mobibot extends PircBot { versionResponse(sender, true); } else if (cmd.equals(Commands.DEBUG_CMD) && isOp(sender)) { if (logger.isDebugEnabled()) { - logger.getLogger().setLevel(loggerLevel); + Configurator.setLevel(logger.getName(), loggerLevel); } else { - logger.getLogger().setLevel(Level.DEBUG); + Configurator.setLevel(logger.getName(), Level.DEBUG); + } send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true); diff --git a/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java index c3f8914..3281ac4 100644 --- a/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java +++ b/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java @@ -31,7 +31,7 @@ */ package net.thauvin.erik.mobibot; -import org.apache.commons.logging.impl.Log4JLogger; +import org.apache.logging.log4j.Logger; import java.io.*; import java.time.Clock; @@ -87,7 +87,7 @@ final class TellMessagesMgr { * @return The {@link net.thauvin.erik.mobibot.TellMessage} array. */ @SuppressWarnings("unchecked") - public static List load(final String file, final Log4JLogger logger) { + public static List load(final String file, final Logger logger) { try { try (ObjectInput input = new ObjectInputStream(new BufferedInputStream(new FileInputStream(file)))) { @@ -115,7 +115,7 @@ final class TellMessagesMgr { * @param messages The {@link net.thauvin.erik.mobibot.TellMessage} array. * @param logger The logger. */ - public static void save(final String file, final List messages, final Log4JLogger logger) { + public static void save(final String file, final List messages, final Logger logger) { try { try (ObjectOutput output = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) { diff --git a/version.properties b/version.properties index f372b5b..0d3297b 100644 --- a/version.properties +++ b/version.properties @@ -1,8 +1,8 @@ -#Mon, 17 Apr 2017 22:49:41 -0700 +#Fri, 19 May 2017 09:20:42 -0700 #Mon Dec 07 01:31:00 PST 2015 version.project=mobibot version.major=0 version.minor=7 -version.patch=1 +version.patch=2 version.prerelease=beta -version.buildmeta=021 \ No newline at end of file +version.buildmeta=022