Skip to content

Commit 8bcbad0

Browse files
Recreate client when config is changed
1 parent 646cc98 commit 8bcbad0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

common/scala/src/main/scala/org/apache/openwhisk/core/database/mongodb/MongoDBArtifactStoreProvider.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@ case class MongoDBConfig(uri: String, database: String) {
3737
}
3838

3939
object MongoDBClient {
40-
private var _client: Option[MongoClient] = None
40+
private var _clientWithConfig: Option[(MongoClient, MongoDBConfig)] = None
4141

4242
def client(config: MongoDBConfig): MongoClient = {
43-
_client.getOrElse {
44-
val client = MongoClient(config.uri)
45-
_client = Some(client)
46-
client
43+
_clientWithConfig match {
44+
case Some((client, oldConfig)) if oldConfig == config =>
45+
client
46+
case _ =>
47+
val client = MongoClient(config.uri)
48+
_clientWithConfig = Some(client, config)
49+
client
4750
}
4851
}
4952
}

tools/travis/runUnitTests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
2323
ROOTDIR="$SCRIPTDIR/../.."
2424

2525
cd $ROOTDIR/tools/travis
26-
# export TESTCONTAINERS_RYUK_DISABLED="true"
26+
export TESTCONTAINERS_RYUK_DISABLED="true"
2727
export ORG_GRADLE_PROJECT_testSetName="REQUIRE_ONLY_DB"
2828

2929
./setupPrereq.sh

0 commit comments

Comments
 (0)