Skip to content

Commit 1d8af52

Browse files
authored
[PECO-1685] Fix loglevel and logPath (#198)
1 parent 1d36aac commit 1d8af52

37 files changed

+169
-147
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ target/
44
*DS_Store
55
TestFile
66
logs/
7+
*.log

pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<maven.compiler.source>11</maven.compiler.source>
2020
<maven.compiler.target>11</maven.compiler.target>
2121
<mockito.version>5.2.0</mockito.version>
22-
<slf4j.version>2.0.7</slf4j.version>
2322
<jackson.version>2.15.1</jackson.version>
2423
<google.guava.version>33.0.0-jre</google.guava.version>
2524
<junit.jupiter.version>5.9.2</junit.jupiter.version>
@@ -32,7 +31,6 @@
3231
<commons-io.version>2.13.0</commons-io.version>
3332
<databricks-sdk.version>0.17.0</databricks-sdk.version>
3433
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
35-
<slf4j-reload4j.version>2.1.0-alpha1</slf4j-reload4j.version>
3634
<sql-logic-test.version>0.3</sql-logic-test.version>
3735
<lz4-compression.version>1.8.0</lz4-compression.version>
3836
<thrift.version>0.19.0</thrift.version>
@@ -110,11 +108,6 @@
110108
<version>${mockito.version}</version>
111109
<scope>test</scope>
112110
</dependency>
113-
<dependency>
114-
<groupId>org.slf4j</groupId>
115-
<artifactId>slf4j-api</artifactId>
116-
<version>${slf4j.version}</version>
117-
</dependency>
118111
<dependency>
119112
<groupId>org.apache.logging.log4j</groupId>
120113
<artifactId>log4j-api</artifactId>
@@ -141,12 +134,6 @@
141134
<version>${immutables.value.version}</version>
142135
<scope>provided</scope>
143136
</dependency>
144-
<dependency>
145-
<groupId>org.slf4j</groupId>
146-
<artifactId>slf4j-reload4j</artifactId>
147-
<version>${slf4j-reload4j.version}</version>
148-
<scope>runtime</scope>
149-
</dependency>
150137
<dependency>
151138
<groupId>net.hydromatic</groupId>
152139
<artifactId>sql-logic-test</artifactId>
@@ -197,6 +184,9 @@
197184
<artifactId>maven-surefire-plugin</artifactId>
198185
<version>${maven-surefire-plugin.version}</version>
199186
<configuration>
187+
<systemPropertyVariables>
188+
<log4j.configurationFile>file:src/main/resources/log4j2.xml</log4j.configurationFile>
189+
</systemPropertyVariables>
200190
<excludes>
201191
<exclude>**/integration/**/*.java</exclude>
202192
<exclude>**/*MetadataBenchmarkingTest.java</exclude>

src/main/java/com/databricks/jdbc/client/http/DatabricksHttpClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
import org.apache.http.impl.conn.DefaultSchemePortResolver;
3535
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
3636
import org.apache.http.protocol.HttpContext;
37-
import org.slf4j.Logger;
38-
import org.slf4j.LoggerFactory;
37+
import org.apache.logging.log4j.LogManager;
38+
import org.apache.logging.log4j.Logger;
3939

4040
/** Http client implementation to be used for executing http requests. */
4141
public class DatabricksHttpClient implements IDatabricksHttpClient {
4242

43-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksHttpClient.class);
43+
private static final Logger LOGGER = LogManager.getLogger(DatabricksHttpClient.class);
4444

4545
// TODO(PECO-1373): Revisit number of connections and connections per route.
4646
private static final int DEFAULT_MAX_HTTP_CONNECTIONS = 1000;

src/main/java/com/databricks/jdbc/client/impl/helper/CommandBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import java.sql.SQLException;
1111
import java.util.Collections;
1212
import java.util.HashMap;
13-
import org.slf4j.Logger;
14-
import org.slf4j.LoggerFactory;
13+
import org.apache.logging.log4j.LogManager;
14+
import org.apache.logging.log4j.Logger;
1515

1616
public class CommandBuilder {
17-
private static final Logger LOGGER = LoggerFactory.getLogger(CommandBuilder.class);
17+
private static final Logger LOGGER = LogManager.getLogger(CommandBuilder.class);
1818
private String catalogName = null;
1919
private String schemaName = null;
2020
private String tableName = null;

src/main/java/com/databricks/jdbc/client/impl/sdk/DatabricksMetadataSdkClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import java.util.concurrent.CopyOnWriteArrayList;
1919
import java.util.concurrent.ExecutorService;
2020
import java.util.concurrent.Executors;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
21+
import org.apache.logging.log4j.LogManager;
22+
import org.apache.logging.log4j.Logger;
2323

2424
/** Implementation for DatabricksMetadataClient using SDK client */
2525
public class DatabricksMetadataSdkClient implements DatabricksMetadataClient {
2626

27-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksSdkClient.class);
27+
private static final Logger LOGGER = LogManager.getLogger(DatabricksSdkClient.class);
2828

2929
private final DatabricksSdkClient sdkClient;
3030

src/main/java/com/databricks/jdbc/client/impl/sdk/DatabricksNewMetadataSdkClient.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import java.sql.ResultSet;
1313
import java.sql.SQLException;
1414
import java.util.*;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
15+
import org.apache.logging.log4j.LogManager;
16+
import org.apache.logging.log4j.Logger;
1717

1818
/**
1919
* This is for the new SQL commands added in runtime. Note that the DatabricksMetadataSdkClient will
@@ -23,8 +23,7 @@
2323
*/
2424
public class DatabricksNewMetadataSdkClient implements DatabricksMetadataClient {
2525

26-
private static final Logger LOGGER =
27-
LoggerFactory.getLogger(DatabricksNewMetadataSdkClient.class);
26+
private static final Logger LOGGER = LogManager.getLogger(DatabricksNewMetadataSdkClient.class);
2827
private final DatabricksSdkClient sdkClient;
2928

3029
public DatabricksNewMetadataSdkClient(DatabricksSdkClient sdkClient) {

src/main/java/com/databricks/jdbc/client/impl/sdk/DatabricksSdkClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import java.util.List;
3030
import java.util.Map;
3131
import java.util.stream.Collectors;
32-
import org.slf4j.Logger;
33-
import org.slf4j.LoggerFactory;
32+
import org.apache.logging.log4j.LogManager;
33+
import org.apache.logging.log4j.Logger;
3434

3535
/** Implementation of DatabricksClient interface using Databricks Java SDK. */
3636
public class DatabricksSdkClient implements DatabricksClient {
37-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksSdkClient.class);
37+
private static final Logger LOGGER = LogManager.getLogger(DatabricksSdkClient.class);
3838
private static final String SYNC_TIMEOUT_VALUE = "10s";
3939
private static final String ASYNC_TIMEOUT_VALUE = "0s";
4040

src/main/java/com/databricks/jdbc/client/impl/sdk/DatabricksUCVolumeClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.databricks.jdbc.client.IDatabricksUCVolumeClient;
44
import java.sql.*;
5-
import org.slf4j.Logger;
6-
import org.slf4j.LoggerFactory;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
77

88
/** Implementation for DatabricksUCVolumeClient */
99
public class DatabricksUCVolumeClient implements IDatabricksUCVolumeClient {
1010

1111
private final Connection connection;
1212

13-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksSdkClient.class);
13+
private static final Logger LOGGER = LogManager.getLogger(DatabricksSdkClient.class);
1414

1515
public DatabricksUCVolumeClient(Connection connection) {
1616
this.connection = connection;

src/main/java/com/databricks/jdbc/client/impl/thrift/DatabricksThriftServiceClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import java.sql.SQLException;
2121
import java.util.*;
2222
import java.util.concurrent.atomic.AtomicInteger;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
23+
import org.apache.logging.log4j.LogManager;
24+
import org.apache.logging.log4j.Logger;
2525

2626
public class DatabricksThriftServiceClient implements DatabricksClient, DatabricksMetadataClient {
2727

28-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksThriftServiceClient.class);
28+
private static final Logger LOGGER = LogManager.getLogger(DatabricksThriftServiceClient.class);
2929

3030
private final DatabricksThriftAccessor thriftAccessor;
3131

src/main/java/com/databricks/jdbc/client/impl/thrift/commons/DatabricksHttpTTransport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
import org.apache.http.HttpResponse;
1414
import org.apache.http.client.methods.HttpPost;
1515
import org.apache.http.entity.ByteArrayEntity;
16+
import org.apache.logging.log4j.LogManager;
17+
import org.apache.logging.log4j.Logger;
1618
import org.apache.thrift.TConfiguration;
1719
import org.apache.thrift.transport.TTransport;
1820
import org.apache.thrift.transport.TTransportException;
19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
2121

2222
public class DatabricksHttpTTransport extends TTransport {
2323

24-
private static final Logger LOGGER = LoggerFactory.getLogger(DatabricksHttpTTransport.class);
24+
private static final Logger LOGGER = LogManager.getLogger(DatabricksHttpTTransport.class);
2525
private final DatabricksHttpClient httpClient;
2626
private final String url;
2727
private Map<String, String> customHeaders = Collections.emptyMap();

0 commit comments

Comments
 (0)