From e8001abfac3ad74ad976798240f5c27dde351531 Mon Sep 17 00:00:00 2001
From: Monasca CI <aadams@hpe.com>
Date: Fri, 1 Dec 2017 17:56:33 -0700
Subject: [PATCH] Make Thresh logging compatable with Storm 1.1.1

The newest version of Storm (1.1.1) looks for a log4j2 file
instead of a logback file

Change-Id: I31b1739e1e42b91c31e1cdd43b539da2b030933a
---
 thresh/src/main/resources/log4j2.xml  | 26 ++++++++++++++++++++++++++
 thresh/src/main/resources/logback.xml | 26 --------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 thresh/src/main/resources/log4j2.xml
 delete mode 100644 thresh/src/main/resources/logback.xml

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 @@
+<configuration monitorInterval="60" shutdownHook="disable">
+  <properties>
+    <property name="pattern">%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</property>
+  </properties>
+
+  <appenders>
+    <Console name="console" target="SYSTEM_OUT">
+      <PatternLayout>
+        <pattern>${pattern}</pattern>
+      </PatternLayout>
+    </Console>
+
+    <File name="FILE" fileName="${LOGDIR:-/tmp}/monasca-thresh.log">
+      <PatternLayout>
+        <pattern>${pattern}</pattern>
+      </PatternLayout>
+    </File>
+  </appenders>
+
+  <loggers>
+    <root level="info">
+      <appender-ref ref="console"/>
+      <appender-ref ref="FILE"/>
+    </root>
+  </loggers>
+</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 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
-    <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.FileAppender">
-        <file>${LOGDIR:-/tmp}/monasca-thresh.log</file>
-
-        <encoder>
-            <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-        </encoder>
-    </appender>
-
-
-    <logger name="monasca" level = "info"/>
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </root>
-</configuration>