From 756adbcc010f8dbbeee94294df634c8cce94372b Mon Sep 17 00:00:00 2001
From: Pradyumna Nagendra <pradyumnan@ilimi.in>
Date: Thu, 19 Sep 2019 18:39:06 +0530
Subject: [PATCH] Issue #000 fix: Fixed relations filters and log4j for publish
 pipeline

---
 .../org/ekstep/graph/dac/model/Filter.java    |  9 +--
 .../src/main/resources/log4j.xml              | 80 +++++++++++++++----
 2 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/platform-core/graph-engine/module/graph-dac-api/src/main/java/org/ekstep/graph/dac/model/Filter.java b/platform-core/graph-engine/module/graph-dac-api/src/main/java/org/ekstep/graph/dac/model/Filter.java
index 95e25108ee..505dd7c121 100644
--- a/platform-core/graph-engine/module/graph-dac-api/src/main/java/org/ekstep/graph/dac/model/Filter.java
+++ b/platform-core/graph-engine/module/graph-dac-api/src/main/java/org/ekstep/graph/dac/model/Filter.java
@@ -65,13 +65,8 @@ public String getCypher(SearchCriteria sc, String param) {
             property = SystemProperties.IL_UNIQUE_ID.name();
         }
         if (SearchConditions.OP_EQUAL.equals(getOperator())) {
-            if (value instanceof String) {
-                sb.append(" ").append(param).append(property).append(" =~ {").append(pIndex).append("} ");
-                sc.params.put("" + pIndex, "(?i)" + value);
-            } else {
-                sb.append(" ").append(param).append(property).append(" = {").append(pIndex).append("} ");
-                sc.params.put("" + pIndex, value);
-            }
+            sb.append(" ").append(param).append(property).append(" = {").append(pIndex).append("} ");
+            sc.params.put("" + pIndex, value);
             pIndex += 1;
         } else if (SearchConditions.OP_LIKE.equals(getOperator())) {
             sb.append(" ").append(param).append(property).append(" =~ {").append(pIndex).append("} ");
diff --git a/platform-jobs/samza/publish-pipeline/src/main/resources/log4j.xml b/platform-jobs/samza/publish-pipeline/src/main/resources/log4j.xml
index d2db3940cc..5a2d627210 100644
--- a/platform-jobs/samza/publish-pipeline/src/main/resources/log4j.xml
+++ b/platform-jobs/samza/publish-pipeline/src/main/resources/log4j.xml
@@ -1,20 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="jmx" class="org.apache.samza.logging.log4j.JmxAppender" />
-	
+	<appender name="jmx" class="org.apache.samza.logging.log4j.JmxAppender"/>
+
 	<appender name="RollingAppender" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="${samza.log.dir}/${samza.container.name}.log" />
-		<param name="append" value="true" />
-	    <param name="maxFileSize" value="100MB" />
-	    <param name="maxBackupIndex" value="5" />
-     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n" />
-	</layout>
+		<param name="File" value="${samza.log.dir}/${samza.container.name}.log"/>
+		<param name="append" value="true"/>
+		<param name="maxFileSize" value="100MB"/>
+		<param name="maxBackupIndex" value="5"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n"/>
+		</layout>
 	</appender>
-  	<root>
-    	<priority value="info" />
-    	<appender-ref ref="RollingAppender"/>
-    	<appender-ref ref="jmx" />
-  	</root>
+	<appender name="DefaultLogAppender" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="${samza.log.dir}/${samza.container.name}_learning_service_mw.log"/>
+		<param name="append" value="true"/>
+		<param name="maxFileSize" value="100MB"/>
+		<param name="maxBackupIndex" value="5"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n"/>
+		</layout>
+	</appender>
+	<appender name="PerfLogAppender" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="${samza.log.dir}/${samza.container.name}_learning_perf_mw.log"/>
+		<param name="append" value="true"/>
+		<param name="maxFileSize" value="100MB"/>
+		<param name="maxBackupIndex" value="5"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n"/>
+		</layout>
+	</appender>
+	<appender name="TelemetryEventAppender" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="${samza.log.dir}/${samza.container.name}_learning_telemetry_event_mw.log"/>
+		<param name="append" value="true"/>
+		<param name="maxFileSize" value="100MB"/>
+		<param name="maxBackupIndex" value="5"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n"/>
+		</layout>
+	</appender>
+	<appender name="StartupAppender" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="${samza.log.dir}/${samza.container.name}-startup.log" />
+		<param name="MaxFileSize" value="256MB" />
+		<param name="MaxBackupIndex" value="1" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} [%p] %m%n" />
+		</layout>
+	</appender>
+	<logger name="STARTUP_LOGGER" additivity="false">
+		<level value="info" />
+		<appender-ref ref="StartupAppender"/>
+	</logger>
+	<root>
+		<priority value="info"/>
+		<appender-ref ref="RollingAppender"/>
+		<appender-ref ref="jmx"/>
+	</root>
+	<logger name="DefaultPlatformLogger">
+		<level value="info" />
+		<appender-ref ref="DefaultLogAppender"/>
+	</logger>
+	<logger name="TelemetryEventLogger">
+		<level value="info" />
+		<appender-ref ref="TelemetryEventAppender"/>
+	</logger>
+	<logger name="PerformanceTestLogger">
+		<level value="info" />
+		<appender-ref ref="PerfLogAppender"/>
+	</logger>
+
 </log4j:configuration>
\ No newline at end of file