Allow specifying lilith's log appender endpoint using environment variable 'LILITH_HOSTNAME'
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/1226af8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/1226af8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/1226af8b Branch: refs/heads/master Commit: 1226af8bf7b131097c1c6c724d67d126a344570d Parents: dd2ae0a Author: Aditya Kishore <[email protected]> Authored: Mon Jun 9 14:50:11 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Mon Jun 9 17:09:49 2014 -0700 ---------------------------------------------------------------------- common/src/test/resources/logback.xml | 8 ++-- .../src/test/resources/logback.xml | 2 +- distribution/src/resources/logback.xml | 2 +- exec/java-exec/src/main/resources/logback.xml | 2 +- exec/java-exec/src/test/resources/logback.xml | 36 +++++++++--------- exec/java-exec/src/test/sh/logback.xml | 40 ++++++++++---------- exec/jdbc/src/test/resources/logback.xml | 6 +-- 7 files changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/common/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/common/src/test/resources/logback.xml b/common/src/test/resources/logback.xml index 782f17f..7591034 100644 --- a/common/src/test/resources/logback.xml +++ b/common/src/test/resources/logback.xml @@ -12,10 +12,10 @@ <configuration> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> - <Compressing>true</Compressing> + <Compressing>true</Compressing> <ReconnectionDelay>10000</ReconnectionDelay> <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> + <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -26,7 +26,7 @@ </encoder> </appender> -<!-- +<!-- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>/logs/test-common.log</file> <encoder> @@ -37,7 +37,7 @@ <maxHistory>30</maxHistory> </rollingPolicy> </appender> - --> + --> <logger name="org.apache.drill" additivity="false"> <level value="debug" /> <appender-ref ref="SOCKET" /> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/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 index b89ceaa..00cc85b 100644 --- a/contrib/storage-hbase/src/test/resources/logback.xml +++ b/contrib/storage-hbase/src/test/resources/logback.xml @@ -23,7 +23,7 @@ <Compressing>true</Compressing> <ReconnectionDelay>10000</ReconnectionDelay> <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> + <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts> </appender> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/distribution/src/resources/logback.xml ---------------------------------------------------------------------- diff --git a/distribution/src/resources/logback.xml b/distribution/src/resources/logback.xml index b751894..4f9b823 100644 --- a/distribution/src/resources/logback.xml +++ b/distribution/src/resources/logback.xml @@ -21,7 +21,7 @@ <Compressing>true</Compressing> <ReconnectionDelay>10000</ReconnectionDelay> <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> + <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/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 index b751894..4f9b823 100644 --- a/exec/java-exec/src/main/resources/logback.xml +++ b/exec/java-exec/src/main/resources/logback.xml @@ -21,7 +21,7 @@ <Compressing>true</Compressing> <ReconnectionDelay>10000</ReconnectionDelay> <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> + <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/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 index b8e0ca2..2dcfed9 100644 --- a/exec/java-exec/src/test/resources/logback.xml +++ b/exec/java-exec/src/test/resources/logback.xml @@ -16,34 +16,34 @@ 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>localhost</RemoteHosts> - </appender> + <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="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="io.netty" additivity="false"> --> <!-- <level value="debug" /> --> <!-- <appender-ref ref="SOCKET" /> --> <!-- </logger> --> - <root> - <level value="error" /> - <appender-ref ref="STDOUT" /> - </root> + <root> + <level value="error" /> + <appender-ref ref="STDOUT" /> + </root> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/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 index 8301a25..6757307 100644 --- a/exec/java-exec/src/test/sh/logback.xml +++ b/exec/java-exec/src/test/sh/logback.xml @@ -16,26 +16,26 @@ 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>localhost</RemoteHosts> - </appender> + <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="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" /> + <logger name="org.apache.drill" additivity="false"> + <level value="info" /> <appender-ref ref="STDOUT" /> <!-- <appender-ref ref="STDOUT" /> --> - </logger> + </logger> <logger name="org.apache.drill" additivity="false"> <level value="debug" /> @@ -43,9 +43,9 @@ <!-- <appender-ref ref="STDOUT" /> --> </logger> - <root> - <level value="error" /> - <appender-ref ref="STDOUT" /> - </root> + <root> + <level value="error" /> + <appender-ref ref="STDOUT" /> + </root> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1226af8b/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 index 13808a6..5facafe 100644 --- a/exec/jdbc/src/test/resources/logback.xml +++ b/exec/jdbc/src/test/resources/logback.xml @@ -18,10 +18,10 @@ <configuration> <appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender"> - <Compressing>true</Compressing> + <Compressing>true</Compressing> <ReconnectionDelay>10000</ReconnectionDelay> <IncludeCallerData>true</IncludeCallerData> - <RemoteHosts>localhost</RemoteHosts> + <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -32,7 +32,7 @@ </encoder> <level value="warn" /> </appender> - + <logger name="org.apache.drill" additivity="false"> <level value="debug" /> <appender-ref ref="SOCKET" />
