Merge pull request #682 from project-sunbird/SB-14884

SB 14884
Sunbird-Knowlg · Sep 19, 2019 · f18519f · f18519f
2 parents 0ea8bc7 + 756adbc
commit f18519f
Show file tree

Hide file tree

Showing 45 changed files with 183 additions and 145 deletions.
diff --git a/...h-engine/module/graph-common/src/main/java/org/ekstep/graph/common/BaseRequestRouter.java b/...h-engine/module/graph-common/src/main/java/org/ekstep/graph/common/BaseRequestRouter.java
@@ -5,8 +5,7 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.Platform;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
@@ -31,7 +30,7 @@ public abstract class BaseRequestRouter extends UntypedActor {
 
     protected long timeout = Platform.config.hasPath("akka.request_timeout") ? (Platform.config.getLong("akka.request_timeout") * 1000): 30000;
 
-    private static final Logger perfLogger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger perfLogger = Logger.getLogger("PerformanceTestLogger");
 
 
 

diff --git a/...re/graph-engine/module/graph-dac-api/src/main/java/org/ekstep/graph/dac/model/Filter.java b/...re/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/...ne/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/CreateNodeTest.java b/...ne/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/CreateNodeTest.java
@@ -2,8 +2,7 @@
 
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.graph.common.enums.GraphHeaderParams;
 import org.ekstep.graph.dac.enums.GraphDACParams;
@@ -23,7 +22,7 @@ public class CreateNodeTest extends GraphEngineTestSetup {
     String graphId = "JAVA_CS";
     String SCENARIO_NAME ="CREATE_NODE";
 
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     @Before
     public void init() throws Exception {

diff --git a/...e/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/SearchNodesTest.java b/...e/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/SearchNodesTest.java
@@ -2,8 +2,7 @@
 
 import java.util.Arrays;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.graph.common.enums.GraphHeaderParams;
 import org.ekstep.graph.dac.enums.GraphDACParams;
@@ -22,7 +21,7 @@ public class SearchNodesTest {
     String graphId = "JAVA_CS";
     String SCENARIO_NAME = "SEARCH_NODES";
 
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     //@BeforeTest
     public void init() throws Exception {

diff --git a/...h-engine/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/TestUtil.java b/...h-engine/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/TestUtil.java
@@ -5,8 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Response;
 import org.ekstep.graph.engine.router.ActorBootstrap;
 import org.ekstep.graph.engine.router.GraphEngineActorPoolMgr;
@@ -20,7 +19,7 @@
 public class TestUtil {
 
     public static Timeout timeout = new Timeout(Duration.create(50, TimeUnit.SECONDS));
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     public static ActorRef initReqRouter() throws Exception {
         ActorBootstrap.getActorSystem();

diff --git a/...ne/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/UpdateNodeTest.java b/...ne/module/graph-engine/src/test/java/org/ekstep/graph/engine/loadtest/UpdateNodeTest.java
@@ -3,8 +3,8 @@
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.graph.common.enums.GraphHeaderParams;
 import org.ekstep.graph.dac.enums.GraphDACParams;
@@ -21,7 +21,7 @@ public class UpdateNodeTest {
     String graphId = "JAVA_CS";
     String SCENARIO_NAME = "UPDATE_NODE";
 
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     //@BeforeTest
     public void init() throws Exception {

diff --git a/...ine/module/graph-engine/src/test/java/org/ekstep/graph/engine/mgr/impl/CSVImportTest.java b/...ine/module/graph-engine/src/test/java/org/ekstep/graph/engine/mgr/impl/CSVImportTest.java
@@ -7,8 +7,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
 import org.ekstep.graph.common.enums.GraphEngineParams;
@@ -33,7 +33,7 @@ public class CSVImportTest {
 
     long timeout = 50000;
     Timeout t = new Timeout(Duration.create(30, TimeUnit.SECONDS));
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     private ActorRef initReqRouter() throws Exception {
         ActorSystem system = ActorSystem.create("MySystem");

diff --git a/...gine/module/graph-engine/src/test/java/org/ekstep/graph/engine/mgr/impl/GraphMgrTest.java b/...gine/module/graph-engine/src/test/java/org/ekstep/graph/engine/mgr/impl/GraphMgrTest.java
@@ -6,8 +6,8 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
@@ -35,7 +35,7 @@ public class GraphMgrTest {
 
     long timeout = 50000;
     Timeout t = new Timeout(Duration.create(30, TimeUnit.SECONDS));
-    private static final Logger logger = LogManager.getLogger("PerformanceTestLogger");
+    private static final Logger logger = Logger.getLogger("PerformanceTestLogger");
 
     private ActorRef initReqRouter() throws Exception {
         ActorSystem system = ActorSystem.create("MySystem");

diff --git a/platform-core/platform-common/pom.xml b/platform-core/platform-common/pom.xml
@@ -21,14 +21,9 @@
 
 	<dependencies>
 		<dependency>
-		    <groupId>org.apache.logging.log4j</groupId>
-		    <artifactId>log4j-api</artifactId>
-		    <version>2.8.2</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.logging.log4j</groupId>
-		    <artifactId>log4j-core</artifactId>
-		    <version>2.8.2</version>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.lmax</groupId>

diff --git a/...latform-telemetry/src/main/java/org/ekstep/telemetry/handler/TelemetryLoggingHandler.java b/...latform-telemetry/src/main/java/org/ekstep/telemetry/handler/TelemetryLoggingHandler.java
@@ -3,8 +3,8 @@
  */
 package org.ekstep.telemetry.handler;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 
 /**
  * This is the custom logger implementation to carry out platform Logging. This
@@ -15,8 +15,8 @@
  */
 public class TelemetryLoggingHandler implements TelemetryHandler {
 
-	private static final Logger rootLogger = LogManager.getLogger("DefaultPlatformLogger");
-	private static final Logger telemetryLogger = LogManager.getLogger("TelemetryEventLogger");
+	private static final Logger rootLogger = Logger.getLogger("DefaultPlatformLogger");
+	private static final Logger telemetryLogger = Logger.getLogger("TelemetryEventLogger");
 
 
 	public void send(String event, Level level) {

diff --git a/...m-core/platform-telemetry/src/main/java/org/ekstep/telemetry/util/LogAsyncGraphEvent.java b/...m-core/platform-telemetry/src/main/java/org/ekstep/telemetry/util/LogAsyncGraphEvent.java
@@ -4,14 +4,14 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class LogAsyncGraphEvent {
 
-	private static final Logger graphEventLogger = LogManager.getLogger("GraphEventLogger");
+	private static final Logger graphEventLogger = Logger.getLogger("GraphEventLogger");
 	private static ObjectMapper mapper = new ObjectMapper();
 
 

diff --git a/...ore/platform-telemetry/src/main/java/org/ekstep/telemetry/util/LogTelemetryEventUtil.java b/...ore/platform-telemetry/src/main/java/org/ekstep/telemetry/util/LogTelemetryEventUtil.java
@@ -5,8 +5,8 @@
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.telemetry.dto.TelemetryBEEvent;
 import org.ekstep.telemetry.dto.TelemetryBJREvent;
@@ -17,7 +17,7 @@
 public class LogTelemetryEventUtil {
 
 
-	private static final Logger telemetryEventLogger = LogManager.getLogger("TelemetryEventLogger");
+	private static final Logger telemetryEventLogger = Logger.getLogger("TelemetryEventLogger");
 	private static ObjectMapper mapper = new ObjectMapper();
 	private static String beJobRequesteventId = "BE_JOB_REQUEST";
 	private static int iteration = 1;

diff --git a/platform-jobs/samza/distribution/pom.xml b/platform-jobs/samza/distribution/pom.xml
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.ekstep</groupId>
 			<artifactId>publish-pipeline</artifactId>
-			<version>0.0.289</version>
+			<version>0.0.293</version>
 			<type>tar.gz</type>
 			<classifier>distribution</classifier>
 		</dependency>

diff --git a/platform-jobs/samza/publish-pipeline/pom.xml b/platform-jobs/samza/publish-pipeline/pom.xml
@@ -7,7 +7,7 @@
 	  <version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>publish-pipeline</artifactId>
-	<version>0.0.289</version>
+	<version>0.0.293</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.ekstep</groupId>

diff --git 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>
diff --git a/platform-modules/actors/src/main/java/org/ekstep/learning/router/LearningRequestRouter.java b/platform-modules/actors/src/main/java/org/ekstep/learning/router/LearningRequestRouter.java
@@ -1,8 +1,8 @@
 package org.ekstep.learning.router;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.ekstep.common.Platform;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
@@ -44,7 +44,7 @@ public class LearningRequestRouter extends UntypedActor {
 	/** The timeout. */
 	protected long timeout = Platform.config.hasPath("akka.request_timeout")? (Platform.config.getLong("akka.request_timeout") * 1000): 30000;
 
-	private static final Logger perfLogger = LogManager.getLogger("PerformanceTestLogger");
+	private static final Logger perfLogger = Logger.getLogger("PerformanceTestLogger");
 
 	/*
 	 * (non-Javadoc)

diff --git a/platform-modules/actors/src/main/java/org/ekstep/learning/util/BaseLearningManager.java b/platform-modules/actors/src/main/java/org/ekstep/learning/util/BaseLearningManager.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
 import org.ekstep.common.enums.TaxonomyErrorCodes;

diff --git a/...ntent-manager/src/main/java/org/ekstep/content/mimetype/mgr/impl/ECMLMimeTypeMgrImpl.java b/...ntent-manager/src/main/java/org/ekstep/content/mimetype/mgr/impl/ECMLMimeTypeMgrImpl.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.ekstep.common.dto.Request;
 import org.ekstep.common.dto.Response;
 import org.ekstep.common.enums.TaxonomyErrorCodes;

diff --git a/...kes/bulk.asset.uploader/src/main/java/org/ekstep/bulkUpload/BulkUploadImageProcessor.java b/...kes/bulk.asset.uploader/src/main/java/org/ekstep/bulkUpload/BulkUploadImageProcessor.java
@@ -23,8 +23,8 @@
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+
+import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ObjectMapper;
 
 public class BulkUploadImageProcessor {
@@ -39,7 +39,7 @@ public class BulkUploadImageProcessor {
 	private static final String NEW_LINE_SEPARATOR = "\n";
 	private static final String SUB_FIELD_SEPARATOR = ",";
 	private static final String output = "/data/contentBundle/output";
-	private static Logger LOGGER = LogManager.getLogger(BulkUploadImageProcessor.class.getName());
+	private static Logger LOGGER = Logger.getLogger(BulkUploadImageProcessor.class.getName());
 	private ObjectMapper mapper = new ObjectMapper();
 
 	static {