erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Moved to Log4J 2.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-05-19 09:43:16 -07:00
parent 32f0585a3c
commit 30c29f1a53
13 changed files with 149 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -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.

17
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -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);

6
src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
View file

@ -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<TellMessage> load(final String file, final Log4JLogger logger) {
public static List<TellMessage> 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<TellMessage> messages, final Log4JLogger logger) {
public static void save(final String file, final List<TellMessage> messages, final Logger logger) {
try {
try (ObjectOutput output = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) {