You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by ma...@apache.org on 2021/02/09 09:18:23 UTC
[james-project] 26/27: JAMES-3225 removes empty lines on linshare
container output
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5e10376e9e39e269f47c127d03c15b37c9ea6853
Author: Jean Helou <jh...@codamens.fr>
AuthorDate: Sat Feb 6 21:26:34 2021 +0100
JAMES-3225 removes empty lines on linshare container output
---
.../src/test/java/org/apache/james/linshare/Linshare.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java
index 43730c1..3f9a1de 100644
--- a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java
+++ b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java
@@ -96,7 +96,7 @@ public class Linshare {
@SuppressWarnings("resource")
private GenericContainer<?> createDockerDatabase() {
return new GenericContainer<>("linagora/linshare-database:2.3.2")
- .withLogConsumer(frame -> LOGGER.debug("<linshare-database> " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("<linshare-database> " + frame.getUtf8String().trim()))
.withNetworkAliases("database", "linshare_database")
.withEnv("PGDATA", "/var/lib/postgresql/data/pgdata")
.withEnv("POSTGRES_USER", "linshare")
@@ -107,7 +107,7 @@ public class Linshare {
@SuppressWarnings("resource")
private GenericContainer<?> createDockerMongodb() {
return new GenericContainer<>("mongo:3.2")
- .withLogConsumer(frame -> LOGGER.debug("<mongo> " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("<mongo> " + frame.getUtf8String().trim()))
.withNetworkAliases("mongodb", "linshare_mongodb")
.withCommand("mongod --smallfiles")
.withNetwork(network);
@@ -116,7 +116,7 @@ public class Linshare {
@SuppressWarnings("resource")
private GenericContainer<?> createDockerLdap() {
return new GenericContainer<>("linagora/linshare-ldap-for-tests:1.0.0")
- .withLogConsumer(frame -> LOGGER.debug("<linshare-ldap-for-tests> " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("<linshare-ldap-for-tests> " + frame.getUtf8String().trim()))
.withNetworkAliases("ldap")
.withNetwork(network);
}
@@ -137,7 +137,7 @@ public class Linshare {
.withFileFromClasspath("conf/id_rsa", "backend/conf/id_rsa.pri")
.withFileFromClasspath("conf/id_rsa.pub", "backend/conf/id_rsa.pub")
.withFileFromClasspath("Dockerfile", "backend/Dockerfile"))
- .withLogConsumer(frame -> LOGGER.debug("<linshare-backend> " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("<linshare-backend> " + frame.getUtf8String().trim()))
.withNetworkAliases("backend")
.withEnv("SMTP_HOST", "linshare_smtp")
.withEnv("SMTP_PORT", "25")
@@ -158,7 +158,7 @@ public class Linshare {
private GenericContainer<?> createLinshareBackendInit() {
return new GenericContainer<>("linagora/linshare-init:2.3.2")
.withNetworkAliases("init")
- .withLogConsumer(frame -> LOGGER.debug("<linshare-init> " + frame.getUtf8String()))
+ .withLogConsumer(frame -> LOGGER.debug("<linshare-init> " + frame.getUtf8String().trim()))
.withEnv("LS_HOST", "backend")
.withEnv("LS_PORT", "8080")
.withEnv("LS_LDAP_NAME", "ldap-local")
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org