Skip to content

Commit e77e44d

Browse files
swbyunswbyun
authored
Merge pull request #278 from experdb/develop
pull request
2 parents 5e8b9ab + f13e40f commit e77e44d

55 files changed

Lines changed: 796 additions & 480 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎eXperDB-Management-Agent/pom.xml‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,43 @@
7373
<dependency>
7474
<groupId>org.slf4j</groupId>
7575
<artifactId>slf4j-api</artifactId>
76-
<version>1.7.12</version>
76+
<version>1.7.25</version>
7777
</dependency>
78+
7879
<dependency>
7980
<groupId>org.slf4j</groupId>
8081
<artifactId>jcl-over-slf4j</artifactId>
8182
<version>1.7.25</version>
8283
</dependency>
83-
<dependency>
84+
85+
<!-- <dependency>
8486
<groupId>log4j</groupId>
8587
<artifactId>log4j</artifactId>
8688
<version>1.2.17</version>
89+
</dependency> -->
90+
91+
<!-- log4j2 취약점 확인으로 인한 버전 업그레이드 -->
92+
<dependency>
93+
<groupId>org.apache.logging.log4j</groupId>
94+
<artifactId>log4j</artifactId>
95+
<version>2.17.1</version>
96+
<type>pom</type>
8797
</dependency>
98+
8899
<dependency>
89-
<groupId>org.slf4j</groupId>
90-
<artifactId>slf4j-log4j12</artifactId>
91-
<version>1.7.25</version>
100+
<groupId>org.apache.logging.log4j</groupId>
101+
<artifactId>log4j-core</artifactId>
102+
<version>2.17.1</version>
92103
</dependency>
104+
105+
<!-- log4j2 취약점 확인으로 인한 버전 업그레이드 -->
106+
<dependency>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-slf4j-impl</artifactId>
109+
<version>2.17.1</version>
110+
</dependency>
111+
112+
93113
<dependency>
94114
<groupId>com.googlecode.json-simple</groupId>
95115
<artifactId>json-simple</artifactId>
@@ -272,18 +292,24 @@
272292
<groupId>org.fusesource</groupId>
273293
<artifactId>sigar</artifactId>
274294
<version>1.6.4</version>
295+
<exclusions>
296+
<exclusion>
297+
<artifactId>log4j</artifactId>
298+
<groupId>log4j</groupId>
299+
</exclusion>
300+
</exclusions>
275301
</dependency>
276302
<!-- https://mvnrepository.com/artifact/org.snmp4j/snmp4j -->
277303
<dependency>
278304
<groupId>org.snmp4j</groupId>
279305
<artifactId>snmp4j</artifactId>
280-
<version>2.6.2</version>
306+
<version>3.6.4</version>
281307
</dependency>
282308
<!-- https://mvnrepository.com/artifact/org.snmp4j/snmp4j-agent -->
283309
<dependency>
284310
<groupId>org.snmp4j</groupId>
285311
<artifactId>snmp4j-agent</artifactId>
286-
<version>2.6.3</version>
312+
<version>3.5.5</version>
287313
</dependency>
288314

289315
<dependency>

‎eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/db/DBCPPoolManager.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@
55
import java.util.Properties;
66
import java.util.concurrent.ConcurrentHashMap;
77

8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
10+
811
import org.apache.commons.dbcp.ConnectionFactory;
912
import org.apache.commons.dbcp.DriverManagerConnectionFactory;
1013
import org.apache.commons.dbcp.PoolableConnectionFactory;
1114
import org.apache.commons.dbcp.PoolingDriver;
1215
import org.apache.commons.pool.ObjectPool;
1316
import org.apache.commons.pool.impl.GenericObjectPool;
14-
import org.apache.log4j.Logger;
17+
1518

1619
import com.k4m.dx.tcontrol.db.datastructure.ConfigInfo;
1720

1821
public class DBCPPoolManager {
19-
private Logger log = Logger.getLogger(DBCPPoolManager.class);
22+
private Logger log = LogManager.getLogger(DBCPPoolManager.class);
2023

2124
public ConcurrentHashMap<String, ConfigInfo> ConnInfoList = new ConcurrentHashMap<String, ConfigInfo>();
2225

‎eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/db/SqlSessionManager.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import org.apache.ibatis.io.Resources;
66
import org.apache.ibatis.session.SqlSessionFactory;
77
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
8-
import org.apache.log4j.Logger;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
10+
911

1012

1113

1214
public class SqlSessionManager {
13-
private static Logger log = Logger.getLogger(SqlSessionManager.class);
15+
private static Logger log = LogManager.getLogger(SqlSessionManager.class);
1416

1517
private static SqlSessionFactory sqlSession = null;
1618

‎eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/server/DxT040.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ public class DxT040 extends SocketCtl{
5353
, "echo $PGDATA/backup" //백업경로
5454
, "df $PGDATA/backup -h" //백업 마운트 용량
5555
, "du -sh $PGDATA/backup" //백업 용량
56-
, "echo $PGDATA/log" //PG_LOG 경로
57-
, "du -s $PGDATA/log" //PG_LOG 용량
56+
, "echo $PGLOG" //PG_LOG 경로
57+
, "du -s $PGLOG" //PG_LOG 용량
5858
, "ls $PGALOG | wc -l"
59-
, "ls $PGDATA/log | wc -l"
59+
, "ls $PGLOG | wc -l"
6060
};
6161

6262
public DxT040(Socket socket, BufferedInputStream is, BufferedOutputStream os) {

‎eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/server/SocketApplication.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.k4m.dx.tcontrol.server;
22

3-
import org.apache.log4j.Logger;
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
5+
46
import org.json.simple.JSONObject;
57

68
/**
@@ -17,7 +19,7 @@
1719
*/
1820

1921
public interface SocketApplication {
20-
public static Logger log = Logger.getLogger(SocketApplication.class);
22+
public static Logger log = LogManager.getLogger(SocketApplication.class);
2123

2224
public JSONObject perform(String tran_cd, JSONObject dbInfoObj) throws Exception;
2325
}

‎eXperDB-Management-Agent/src/main/resources/log4j.xml‎

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎eXperDB-Management-Agent/src/main/resources/log4j2.xml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Configuration status="INFO">
3+
<Properties>
4+
<Property name="LOG_PATTERN">[%d{yyyy-MM-dd HH:mm:ss}][%-5p]%m\n</Property>
5+
</Properties>
6+
7+
<Appenders>
8+
<Console name="ConsoleLog" target="SYSTEM_OUT">
9+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
10+
</Console>
11+
12+
<Console name="sql" target="SYSTEM_OUT">
13+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
14+
</Console>
15+
16+
<RollingFile name="consoleToFile"
17+
fileName="../logs/console.log"
18+
filePattern="./logs/console-%d{yyyy-MM-dd}-%i.log">
19+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8" />
20+
<ThresholdFilter level="INFO"/>
21+
<Policies>
22+
<TimeBasedTriggeringPolicy interval="1" />
23+
</Policies>
24+
</RollingFile>
25+
26+
27+
<RollingFile name="daemonStartToFile"
28+
fileName="../logs/daemonStart.log"
29+
filePattern="./logs/daemonStart-%d{yyyy-MM-dd}-%i.log">
30+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8" />
31+
<ThresholdFilter level="DEBUG"/>
32+
<Policies>
33+
<TimeBasedTriggeringPolicy interval="1" />
34+
</Policies>
35+
</RollingFile>
36+
37+
38+
<RollingFile name="errorToFile"
39+
fileName="../logs/error.log"
40+
filePattern="./logs/error-%d{yyyy-MM-dd}-%i.log">
41+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8" />
42+
<ThresholdFilter level="DEBUG"/>
43+
<Policies>
44+
<TimeBasedTriggeringPolicy interval="1" />
45+
</Policies>
46+
</RollingFile>
47+
48+
49+
<RollingFile name="socketToFile"
50+
fileName="../logs/socket.log"
51+
filePattern="./logs/socket-%d{yyyy-MM-dd}-%i.log">
52+
<PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8" />
53+
<ThresholdFilter level="DEBUG"/>
54+
<Policies>
55+
<TimeBasedTriggeringPolicy interval="1" />
56+
</Policies>
57+
</RollingFile>
58+
59+
</Appenders>
60+
61+
62+
<Loggers>
63+
<Root level="error">
64+
<AppenderRef ref="consoleToFile"/>
65+
<AppenderRef ref="errorToFile"/>
66+
</Root>
67+
<Logger name="com.k4m.dx.tcontrol" level="DEBUG">
68+
<AppenderRef ref="consoleToFile"/>
69+
</Logger>
70+
<Logger name="DaemonStartLogger" level="INFO">
71+
<AppenderRef ref="daemonStartToFile"/>
72+
</Logger>
73+
<Logger name="errorLogger" level="ERROR">
74+
<AppenderRef ref="errorToFile"/>
75+
</Logger>
76+
<Logger name="socketLogger" level="DEBUG">
77+
<AppenderRef ref="socketToFile"/>
78+
</Logger>
79+
80+
</Loggers>
81+
82+
</Configuration>

0 commit comments

Comments
 (0)