Skip to content

Commit a5877ec

Browse files
committed
Upgrade to log4j 2
1 parent 238b36c commit a5877ec

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
## Eclipse
33
#################
44

5+
target/
56
*.pydevproject
67
.project
78
.metadata

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ The `adapters.xml` file for the Stock-List Demo, should look like:
8080
<!-- Optional for StockQuotesDataAdapter.
8181
Configuration file for the Adapter's own logging.
8282
Logging is managed through log4j. -->
83-
<param name="log_config">adapters_log_conf.xml</param>
8483
<param name="log_config_refresh_seconds">10</param>
8584

8685
</data_provider>

pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,10 @@
6464
<version>7.3.0</version>
6565
</dependency>
6666
<dependency>
67-
<groupId>log4j</groupId>
68-
<artifactId>log4j</artifactId>
69-
<version>1.2.17</version>
70-
</dependency>
71-
67+
<groupId>org.apache.logging.log4j</groupId>
68+
<artifactId>log4j-core</artifactId>
69+
<version>2.13.3</version>
70+
</dependency>
7271
</dependencies>
7372

7473
</project>

src/main/java/com/lightstreamer/src_adapter/stocklist_demo/adapters/StockQuotesDataAdapter.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import java.util.Set;
2525
import java.util.concurrent.ConcurrentHashMap;
2626

27-
import org.apache.log4j.Logger;
28-
import org.apache.log4j.xml.DOMConfigurator;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2929

3030
import stocklist_demo.feed_simulator.ExternalFeedListener;
3131
import stocklist_demo.feed_simulator.ExternalFeedSimulator;
@@ -102,6 +102,7 @@ public StockQuotesDataAdapter() {
102102
* feed, for a real feed).
103103
*/
104104
public void init(Map params, File configDir) {
105+
/*
105106
String logConfig = (String) params.get("log_config");
106107
if (logConfig != null) {
107108
File logConfigFile = new File(configDir, logConfig);
@@ -111,8 +112,8 @@ public void init(Map params, File configDir) {
111112
} else {
112113
DOMConfigurator.configure(logConfigFile.getAbsolutePath());
113114
}
114-
}
115-
logger = Logger.getLogger("LS_demos_Logger.StockQuotes");
115+
}*/
116+
logger = LogManager.getLogger("LS_demos_Logger.StockQuotes");
116117

117118
//The feedMap of this adapter is never used
118119
// Read the Adapter Set name, which is supplied by the Server as a parameter

0 commit comments

Comments
 (0)