Merge pull request #11851 from geoand/#11844

Quiet down Mongo test logs
quarkusio · Sep 3, 2020 · 3975d42 · 3975d42
2 parents f186775 + 38389fd
commit 3975d42
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 17 deletions.
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java
@@ -6,12 +6,16 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 
 public class MongoTestBase {
@@ -80,7 +84,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll

diff --git a/...mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java b/...mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java
@@ -20,13 +20,17 @@
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongoCmdOptionsBuilder;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 
 public class MongoWithReplicasTestBase {
@@ -85,7 +89,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
@@ -109,15 +117,15 @@ private static void initializeReplicaSet(final List<IMongodConfig> mongodConfigL
             final MongoDatabase mongoAdminDB = mongo.getDatabase("admin");
 
             Document cr = mongoAdminDB.runCommand(new Document("isMaster", 1));
-            LOGGER.infof("isMaster: %s", cr);
+            LOGGER.debugf("isMaster: %s", cr);
 
             // Build replica set configuration settings
             final Document rsConfiguration = buildReplicaSetConfiguration(mongodConfigList);
-            LOGGER.infof("replSetSettings: %s", rsConfiguration);
+            LOGGER.debugf("replSetSettings: %s", rsConfiguration);
 
             // Initialize replica set
             cr = mongoAdminDB.runCommand(new Document("replSetInitiate", rsConfiguration));
-            LOGGER.infof("replSetInitiate: %s", cr);
+            LOGGER.debugf("replSetInitiate: %s", cr);
 
             // Check replica set status before to proceed
             await()

diff --git a/...sions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java b/...sions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java
@@ -16,12 +16,16 @@
 
 import com.mongodb.client.result.InsertOneResult;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.smallrye.mutiny.Uni;
 
@@ -92,7 +96,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll

diff --git a/...b-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java b/...b-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java
@@ -20,13 +20,17 @@
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongoCmdOptionsBuilder;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 
 public class MongoWithReplicasTestBase {
@@ -85,7 +89,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
@@ -117,15 +125,15 @@ private static void initializeReplicaSet(final List<IMongodConfig> mongodConfigL
             final MongoDatabase mongoAdminDB = mongo.getDatabase("admin");
 
             Document cr = mongoAdminDB.runCommand(new Document("isMaster", 1));
-            LOGGER.infof("isMaster: %s", cr);
+            LOGGER.debugf("isMaster: %s", cr);
 
             // Build replica set configuration settings
             final Document rsConfiguration = buildReplicaSetConfiguration(mongodConfigList);
-            LOGGER.infof("replSetSettings: %s", rsConfiguration);
+            LOGGER.debugf("replSetSettings: %s", rsConfiguration);
 
             // Initialize replica set
             cr = mongoAdminDB.runCommand(new Document("replSetInitiate", rsConfiguration));
-            LOGGER.infof("replSetInitiate: %s", cr);
+            LOGGER.debugf("replSetInitiate: %s", cr);
 
             // Check replica set status before to proceed
             await()

diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java
@@ -6,12 +6,16 @@
 
 import org.jboss.logging.Logger;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
@@ -60,7 +64,11 @@ private MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @Override

diff --git a/integration-tests/mongodb-panache-kotlin/src/main/resources/application.properties b/integration-tests/mongodb-panache-kotlin/src/main/resources/application.properties
@@ -6,4 +6,4 @@ quarkus.mongodb.database=books
 quarkus.mongodb.cl2.connection-string=mongodb://localhost:27018
 quarkus.mongodb.cl2.write-concern.journal=false
 
-quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
+#quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
diff --git a/...mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongoTestResource.kt b/...mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongoTestResource.kt
@@ -1,11 +1,15 @@
 package io.quarkus.it.mongodb.panache
 
+import de.flapdoodle.embed.mongo.Command
 import de.flapdoodle.embed.mongo.MongodExecutable
 import de.flapdoodle.embed.mongo.MongodStarter
 import de.flapdoodle.embed.mongo.config.IMongodConfig
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder
 import de.flapdoodle.embed.mongo.config.Net
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder
 import de.flapdoodle.embed.mongo.distribution.Version
+import de.flapdoodle.embed.process.config.io.ProcessOutput
+import de.flapdoodle.embed.process.io.Processors
 import de.flapdoodle.embed.process.runtime.Network
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager
 import org.jboss.logging.Logger
@@ -57,10 +61,15 @@ class MongoTestResource : QuarkusTestResourceLifecycleManager {
     }
 
     private fun doGetExecutable(config: IMongodConfig): MongodExecutable {
-        return MongodStarter.getDefaultInstance().prepare(config)
+        val runtimeConfig = RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput(Processors.silent(),
+                        Processors.silent(), Processors.silent()))
+                .build()
+        return MongodStarter.getInstance(runtimeConfig).prepare(config)
     }
 
     override fun stop() {
         mongod?.stop()
     }
-}
+}
diff --git a/integration-tests/mongodb-panache/src/main/resources/application.properties b/integration-tests/mongodb-panache/src/main/resources/application.properties
@@ -6,5 +6,5 @@ quarkus.mongodb.database=books
 quarkus.mongodb.cl2.connection-string=mongodb://localhost:27018
 quarkus.mongodb.cl2.write-concern.journal=false
 
-quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
-quarkus.mongodb.metrics.enabled=true
+#quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
+quarkus.mongodb.metrics.enabled=true
diff --git a/...-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java b/...-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java
@@ -5,12 +5,16 @@
 
 import org.jboss.logging.Logger;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
@@ -59,7 +63,11 @@ private MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @Override