summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-10 15:28:04 +0000
committerGerrit Code Review <review@openstack.org>2018-04-10 15:28:04 +0000
commit5f76cf1668ee827155c3cb4c736575de96a5a5a2 (patch)
tree6134ad5a2131fd2b996bbd040c204da3950c2947
parentde6b9496dedd03eec3774deaafc4b0fa19035b8f (diff)
parente8001abfac3ad74ad976798240f5c27dde351531 (diff)
Merge "Make Thresh logging compatable with Storm 1.1.1"2.3.0
-rw-r--r--thresh/src/main/resources/log4j2.xml26
-rw-r--r--thresh/src/main/resources/logback.xml26
2 files changed, 26 insertions, 26 deletions
diff --git a/thresh/src/main/resources/log4j2.xml b/thresh/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..2c096e2
--- /dev/null
+++ b/thresh/src/main/resources/log4j2.xml
@@ -0,0 +1,26 @@
1<configuration monitorInterval="60" shutdownHook="disable">
2 <properties>
3 <property name="pattern">%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</property>
4 </properties>
5
6 <appenders>
7 <Console name="console" target="SYSTEM_OUT">
8 <PatternLayout>
9 <pattern>${pattern}</pattern>
10 </PatternLayout>
11 </Console>
12
13 <File name="FILE" fileName="${LOGDIR:-/tmp}/monasca-thresh.log">
14 <PatternLayout>
15 <pattern>${pattern}</pattern>
16 </PatternLayout>
17 </File>
18 </appenders>
19
20 <loggers>
21 <root level="info">
22 <appender-ref ref="console"/>
23 <appender-ref ref="FILE"/>
24 </root>
25 </loggers>
26</configuration>
diff --git a/thresh/src/main/resources/logback.xml b/thresh/src/main/resources/logback.xml
deleted file mode 100644
index 509be9a..0000000
--- a/thresh/src/main/resources/logback.xml
+++ /dev/null
@@ -1,26 +0,0 @@
1<configuration scan="true" scanPeriod="30 seconds">
2
3 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4 <!-- encoders are assigned the type
5 ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
6 <encoder>
7 <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
8 </encoder>
9 </appender>
10
11 <appender name="FILE" class="ch.qos.logback.core.FileAppender">
12 <file>${LOGDIR:-/tmp}/monasca-thresh.log</file>
13
14 <encoder>
15 <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
16 </encoder>
17 </appender>
18
19
20 <logger name="monasca" level = "info"/>
21
22 <root level="info">
23 <appender-ref ref="STDOUT" />
24 <appender-ref ref="FILE" />
25 </root>
26</configuration>