You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ar...@apache.org on 2019/11/20 11:40:14 UTC
[drill] 02/04: DRILL-7448: Fix warnings when running Drill memory
tests
This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 120e10bb8d79d99117464404bb6c870a10169d92
Author: Bohdan Kazydub <bo...@gmail.com>
AuthorDate: Mon Nov 18 19:51:55 2019 +0200
DRILL-7448: Fix warnings when running Drill memory tests
closes #1902
---
common/pom.xml | 8 -----
common/src/test/resources/logback-test.xml | 47 ++++++++++++++----------------
2 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index 743374d..47b60fc 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -102,14 +102,6 @@
<version>2.9</version>
</dependency>
- <!-- Conditional processing in logback configuration files requires the Janino library
- (see logback-test.xml, DRILL-7397, http://logback.qos.ch/setup.html#janino) -->
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/common/src/test/resources/logback-test.xml b/common/src/test/resources/logback-test.xml
index 06004a6..f47af26 100644
--- a/common/src/test/resources/logback-test.xml
+++ b/common/src/test/resources/logback-test.xml
@@ -20,26 +20,26 @@
-->
<configuration>
- <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
- <then>
- <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
- <Compressing>true</Compressing>
- <ReconnectionDelay>10000</ReconnectionDelay>
- <IncludeCallerData>true</IncludeCallerData>
- <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug"/>
- <appender-ref ref="SOCKET"/>
- </logger>
-
- <logger name="query.logger" additivity="false">
- <level value="info"/>
- <appender-ref ref="SOCKET"/>
- </logger>
- </then>
- </if>
+ <!-- Uncomment the lines below (and <appender-ref ref="SOCKET"/> inside <root>)
+ to be able to use Lilith for viewing log events -->
+ <!--
+ <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
+ <Compressing>true</Compressing>
+ <ReconnectionDelay>10000</ReconnectionDelay>
+ <IncludeCallerData>true</IncludeCallerData>
+ <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts>
+ </appender>
+
+ <logger name="org.apache.drill" additivity="false">
+ <level value="debug"/>
+ <appender-ref ref="SOCKET"/>
+ </logger>
+
+ <logger name="query.logger" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="SOCKET"/>
+ </logger>
+ -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
@@ -51,11 +51,8 @@
<root>
<level value="error"/>
- <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
- <then>
- <appender-ref ref="SOCKET"/>
- </then>
- </if>
+ <!-- Uncomment the next line (and the lines above) to be able to use Lilith for viewing log events -->
+ <!-- <appender-ref ref="SOCKET"/>-->
<!-- <appender-ref ref="STDOUT"/> -->
</root>