Migrated to log4j2
This commit is contained in:
parent
1c4a0cac1e
commit
5e382c8eb8
11
pom.xml
11
pom.xml
|
@ -29,9 +29,14 @@
|
||||||
<version>20180130</version>
|
<version>20180130</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j-api</artifactId>
|
||||||
<version>1.2.17</version>
|
<version>2.11.1</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-core</artifactId>
|
||||||
|
<version>2.11.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -42,7 +42,8 @@ public class TelegramAPI implements Runnable {
|
||||||
private LinkedList<TUser> users = new LinkedList<>();
|
private LinkedList<TUser> users = new LinkedList<>();
|
||||||
private CommandManager cmdmgr = new CommandManager();
|
private CommandManager cmdmgr = new CommandManager();
|
||||||
private EventManager evntmgr = new EventManager();
|
private EventManager evntmgr = new EventManager();
|
||||||
Log log = new SimpleLog();
|
//Log log = new SimpleLog();
|
||||||
|
Log log = new Log4JLog();
|
||||||
|
|
||||||
public TelegramAPI(String apikey) {
|
public TelegramAPI(String apikey) {
|
||||||
if (!apikey.matches(TOKENREGEX) ) {
|
if (!apikey.matches(TOKENREGEX) ) {
|
||||||
|
@ -70,7 +71,7 @@ public class TelegramAPI implements Runnable {
|
||||||
OutputStreamWriter wr = new OutputStreamWriter(con.getOutputStream());
|
OutputStreamWriter wr = new OutputStreamWriter(con.getOutputStream());
|
||||||
wr.write(parameter);
|
wr.write(parameter);
|
||||||
wr.flush();
|
wr.flush();
|
||||||
log.log( this.getClass().getSimpleName() + ": request: " + request + " content " + parameter + " -> " + con.getResponseCode() + ", " + con.getResponseMessage());
|
log.log( "request: " + request + " content " + parameter + " -> " + con.getResponseCode() + ", " + con.getResponseMessage());
|
||||||
if(con.getResponseCode() == 200) {
|
if(con.getResponseCode() == 200) {
|
||||||
Scanner s = new Scanner(con.getInputStream());
|
Scanner s = new Scanner(con.getInputStream());
|
||||||
StringBuilder sb_apianswer = new StringBuilder();
|
StringBuilder sb_apianswer = new StringBuilder();
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
package de.mrbesen.telegram.log;
|
package de.mrbesen.telegram.log;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class Log4JLog extends Log {
|
public class Log4JLog extends Log {
|
||||||
|
|
||||||
Logger log;
|
Logger log;
|
||||||
|
|
||||||
public Log4JLog() {
|
public Log4JLog() {
|
||||||
log = Logger.getRootLogger();
|
log = LogManager.getLogger("TelegramAPI");
|
||||||
}
|
}
|
||||||
|
|
||||||
public Log4JLog(Logger l) {
|
public Log4JLog(Logger l) {
|
||||||
|
|
|
@ -24,8 +24,7 @@ public class Main implements Runnable, EventListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Main() {
|
public Main() {
|
||||||
String token = "692523284:AAEO1xY3GxsIOc5Tb6cI7Ild4IGTStLBiwk";
|
String token = "577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw";
|
||||||
String tokenmain = "577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw";
|
|
||||||
api = new TelegramAPI(token);
|
api = new TelegramAPI(token);
|
||||||
api.getCommandManager().registerCommand("test", new SimpleTestCase());
|
api.getCommandManager().registerCommand("test", new SimpleTestCase());
|
||||||
api.getCommandManager().registerCommand("inlinekb", new InlineKeyboardTC());
|
api.getCommandManager().registerCommand("inlinekb", new InlineKeyboardTC());
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
status = error
|
||||||
|
name = PropertiesConfig
|
||||||
|
|
||||||
|
filters = threshold
|
||||||
|
|
||||||
|
filter.threshold.type = ThresholdFilter
|
||||||
|
filter.threshold.level = debug
|
||||||
|
|
||||||
|
appenders = console
|
||||||
|
|
||||||
|
appender.console.type = Console
|
||||||
|
appender.console.name = STDOUT
|
||||||
|
appender.console.layout.type = PatternLayout
|
||||||
|
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
|
||||||
|
|
||||||
|
rootLogger.level = debug
|
||||||
|
rootLogger.appenderRefs = stdout
|
||||||
|
rootLogger.appenderRef.stdout.ref = STDOUT
|
Loading…
Reference in New Issue