From 64949012e45e18734b83914f70b92b166ac2c0ce Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 14 Jun 2019 12:39:18 +0200
Subject: [PATCH] openvidu-server: logback color configuration inversed

---
 .../src/main/resources/application.properties |  1 -
 .../src/main/resources/logback.xml            | 20 ++++++++++++++++---
 .../test/e2e/OpenViduTestAppE2eTest.java      |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties
index 71f71079..91aa21d3 100644
--- a/openvidu-server/src/main/resources/application.properties
+++ b/openvidu-server/src/main/resources/application.properties
@@ -2,7 +2,6 @@ server.address: 0.0.0.0
 server.ssl.enabled: true
 openvidu.recording.version: 2.9.0
 logging.level.root: info
-logging.colors: true
 spring.main.allow-bean-definition-overriding: true
 
 
diff --git a/openvidu-server/src/main/resources/logback.xml b/openvidu-server/src/main/resources/logback.xml
index 4abbec3d..0ad82bfb 100644
--- a/openvidu-server/src/main/resources/logback.xml
+++ b/openvidu-server/src/main/resources/logback.xml
@@ -5,18 +5,32 @@
 	<appender name="STDOUT"
 		class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<if condition='property("logging.colors").equalsIgnoreCase("false")'>
+			<if
+				condition='property("logging.colors").equalsIgnoreCase("true")'>
 				<then>
-					<pattern>[%p] %d [%.15t] %c \(%M\) - %msg%n
+					<pattern>%highlight([%p]) %d %magenta([%.15t]) %c \(%M\) - %msg%n
 					</pattern>
 				</then>
 				<else>
-					<pattern>%highlight([%p]) %d %magenta([%.15t]) %c \(%M\) - %msg%n
+					<pattern>[%p] %d [%.15t] %c \(%M\) - %msg%n
 					</pattern>
 				</else>
 			</if>
 		</encoder>
 	</appender>
+
+	<!--<appender name="CUSTOMCLASS"
+		class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%highlight([%p]) %d %magenta([%.15t]) %boldGreen(%c \(%M\) - %msg%n)
+			</pattern>
+		</encoder>
+	</appender>
+	<logger
+		name="io.openvidu.server.kurento.core.KurentoSessionManager">
+		<appender-ref ref="CUSTOMCLASS" />
+	</logger>-->
+	
 	<root>
 		<level value="INFO" />
 		<appender-ref ref="STDOUT" />
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
index 5103f588..5f1fd033 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
@@ -1723,6 +1723,9 @@ public class OpenViduTestAppE2eTest {
 		WebElement filterTypeInput = user.getDriver().findElement(By.id("filter-type-field"));
 		filterTypeInput.clear();
 		filterTypeInput.sendKeys("NotAllowedFilter");
+		
+		Thread.sleep(1000);
+		
 		user.getDriver().findElement(By.id("apply-filter-btn")).click();
 		user.getWaiter().until(ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value",
 				"Error [You don't have permissions to apply a filter]"));