You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pr...@apache.org on 2017/09/14 22:53:16 UTC
drill git commit: DRILL-5761: Disable Lilith
ClassicMultiplexSocketAppender by default. Unify logback files.
Repository: drill
Updated Branches:
refs/heads/master 0b1cb98ad -> d1552db38
DRILL-5761: Disable Lilith ClassicMultiplexSocketAppender by default.
Unify logback files.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d1552db3
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d1552db3
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d1552db3
Branch: refs/heads/master
Commit: d1552db3850a80b67e4bc33877f70675ec7566a6
Parents: 0b1cb98
Author: Volodymyr Vysotskyi <vv...@gmail.com>
Authored: Thu Aug 31 12:52:43 2017 +0000
Committer: Paul Rogers <pr...@maprtech.com>
Committed: Thu Sep 14 15:52:32 2017 -0700
----------------------------------------------------------------------
common/src/test/resources/logback-test.xml | 53 ++++++++++++++
common/src/test/resources/logback.xml | 55 ---------------
.../src/test/resources/logback.xml | 74 --------------------
.../src/test/resources/logback.xml | 74 --------------------
.../core/src/test/resources/logback.xml | 64 -----------------
.../storage-jdbc/src/test/resources/logback.xml | 48 -------------
.../storage-kudu/src/test/resources/logback.xml | 64 -----------------
.../src/test/resources/logback.xml | 59 ----------------
exec/java-exec/src/main/resources/logback.xml | 65 -----------------
exec/java-exec/src/test/resources/logback.xml | 54 --------------
exec/java-exec/src/test/sh/logback.xml | 51 --------------
exec/jdbc-all/src/test/resources/logback.xml | 54 --------------
exec/jdbc/src/test/resources/logback.xml | 48 -------------
pom.xml | 1 -
14 files changed, 53 insertions(+), 711 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/common/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/logback-test.xml b/common/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..8ee3537
--- /dev/null
+++ b/common/src/test/resources/logback-test.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<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>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="error"/>
+ <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
+ <then>
+ <appender-ref ref="SOCKET"/>
+ </then>
+ </if>
+ <appender-ref ref="STDOUT"/>
+ </root>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/common/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/logback.xml b/common/src/test/resources/logback.xml
deleted file mode 100644
index a6a3dba..0000000
--- a/common/src/test/resources/logback.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<configuration>
-
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
-<!--
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>/logs/test-common.log</file>
- <encoder>
- <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>/logs/test-common.%d{yyyy-MM-dd}.log</fileNamePattern>
- <maxHistory>30</maxHistory>
- </rollingPolicy>
- </appender>
- -->
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- <appender-ref ref="STDOUT" />
-<!-- <appender-ref ref="FILE" /> -->
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="SOCKET" />
- <appender-ref ref="STDOUT" />
-<!-- <appender-ref ref="FILE" /> -->
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/format-maprdb/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/resources/logback.xml b/contrib/format-maprdb/src/test/resources/logback.xml
deleted file mode 100644
index 38c2fc8..0000000
--- a/contrib/format-maprdb/src/test/resources/logback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <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>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <!-- The property 'logback.log.dir' is defined in pom.xml -->
- <file>${logback.log.dir:-./target/surefire-reports}/maprdb-tests-${bySecond}.log</file>
- <append>false</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="com.mapr" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="com.mapr" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <logger name="org.apache.hadoop" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/storage-hbase/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/src/test/resources/logback.xml b/contrib/storage-hbase/src/test/resources/logback.xml
deleted file mode 100644
index 8d3fc81..0000000
--- a/contrib/storage-hbase/src/test/resources/logback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <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>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <!-- The property 'logback.log.dir' is defined in pom.xml -->
- <file>${logback.log.dir:-./target/surefire-reports}/hbase-tests-${bySecond}.log</file>
- <append>false</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <logger name="org.apache.hadoop" additivity="false">
- <level value="warn" />
- <appender-ref ref="STDOUT" />
- <appender-ref ref="SOCKET" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.hadoop.hbase.client.ConnectionManager" additivity="false">
- <level value="error" />
- <appender-ref ref="STDOUT" />
- <appender-ref ref="SOCKET" />
- <appender-ref ref="FILE" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- <appender-ref ref="SOCKET" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/storage-hive/core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/src/test/resources/logback.xml b/contrib/storage-hive/core/src/test/resources/logback.xml
deleted file mode 100644
index a9e1586..0000000
--- a/contrib/storage-hive/core/src/test/resources/logback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <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>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <!-- The property 'logback.log.dir' is defined in pom.xml -->
- <file>${logback.log.dir:-./target/surefire-reports}/hive-tests-${bySecond}.log</file>
- <append>false</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <logger name="org.apache.hadoop" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/storage-jdbc/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-jdbc/src/test/resources/logback.xml b/contrib/storage-jdbc/src/test/resources/logback.xml
deleted file mode 100644
index 5facafe..0000000
--- a/contrib/storage-jdbc/src/test/resources/logback.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
-
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- <level value="warn" />
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </logger>
-
- <root>
- <level value="debug" />
- <appender-ref ref="SOCKET" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/storage-kudu/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-kudu/src/test/resources/logback.xml b/contrib/storage-kudu/src/test/resources/logback.xml
deleted file mode 100644
index 6ef172b..0000000
--- a/contrib/storage-kudu/src/test/resources/logback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <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>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <!-- The property 'logback.log.dir' is defined in pom.xml -->
- <file>${logback.log.dir:-./target/surefire-reports}/hbase-tests-${bySecond}.log</file>
- <append>false</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <logger name="org.apache.hadoop" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/contrib/storage-mongo/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-mongo/src/test/resources/logback.xml b/contrib/storage-mongo/src/test/resources/logback.xml
deleted file mode 100644
index dc5e797..0000000
--- a/contrib/storage-mongo/src/test/resources/logback.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <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>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <!-- The property 'logback.log.dir' is defined in pom.xml -->
- <file>${logback.log.dir:-./target/surefire-reports}/mongo-tests-${bySecond}.log</file>
- <append>false</append>
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/exec/java-exec/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/resources/logback.xml b/exec/java-exec/src/main/resources/logback.xml
deleted file mode 100644
index 4f9b823..0000000
--- a/exec/java-exec/src/main/resources/logback.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
- </pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${log.path}.%i</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>10</maxIndex>
- </rollingPolicy>
-
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>%date{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/exec/java-exec/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/logback.xml b/exec/java-exec/src/test/resources/logback.xml
deleted file mode 100644
index 54ccb42..0000000
--- a/exec/java-exec/src/test/resources/logback.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
- </pattern>
- </encoder>
- </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>
-
-<!-- <logger name="io.netty" additivity="false"> -->
-<!-- <level value="debug" /> -->
-<!-- <appender-ref ref="SOCKET" /> -->
-<!-- </logger> -->
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/exec/java-exec/src/test/sh/logback.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/sh/logback.xml b/exec/java-exec/src/test/sh/logback.xml
deleted file mode 100644
index 6757307..0000000
--- a/exec/java-exec/src/test/sh/logback.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
- </pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="info" />
- <appender-ref ref="STDOUT" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </logger>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </logger>
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/exec/jdbc-all/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/src/test/resources/logback.xml b/exec/jdbc-all/src/test/resources/logback.xml
deleted file mode 100644
index 54ccb42..0000000
--- a/exec/jdbc-all/src/test/resources/logback.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
- </pattern>
- </encoder>
- </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>
-
-<!-- <logger name="io.netty" additivity="false"> -->
-<!-- <level value="debug" /> -->
-<!-- <appender-ref ref="SOCKET" /> -->
-<!-- </logger> -->
-
- <root>
- <level value="error" />
- <appender-ref ref="STDOUT" />
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/exec/jdbc/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/resources/logback.xml b/exec/jdbc/src/test/resources/logback.xml
deleted file mode 100644
index 5facafe..0000000
--- a/exec/jdbc/src/test/resources/logback.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration>
-
- <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>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- <level value="warn" />
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="debug" />
- <appender-ref ref="SOCKET" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </logger>
-
- <root>
- <level value="debug" />
- <appender-ref ref="SOCKET" />
-<!-- <appender-ref ref="STDOUT" /> -->
- </root>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/drill/blob/d1552db3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a843960..54d11d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,6 @@
<configuration>
<excludes>
<exclude>**/logging.properties</exclude>
- <exclude>**/logback-test.xml</exclude>
<exclude>**/logback.out.xml</exclude>
<exclude>**/logback.xml</exclude>
</excludes>