Skip to content

Commit 499f20e

Browse files
committed
Merge branch 'fixes/use-launch-timeout-for-replsets' of github.com:camspiers/mongodb-memory-server into camspiers-fixes/use-launch-timeout-for-replsets
2 parents 3ed0d97 + 575f07a commit 499f20e

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

packages/mongodb-memory-server-core/src/MongoMemoryReplSet.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
322322
if (baseOpts.replicaMemberConfig) {
323323
opts.replicaMemberConfig = baseOpts.replicaMemberConfig;
324324
}
325+
if (baseOpts.launchTimeout) {
326+
opts.launchTimeout = baseOpts.launchTimeout;
327+
}
325328

326329
log('getInstanceOpts: instance opts:', opts);
327330

packages/mongodb-memory-server-core/src/util/MongoInstance.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,12 @@ export interface MongoMemoryInstanceOptsBase {
132132
* Only has a effect when started with "MongoMemoryReplSet"
133133
*/
134134
replicaMemberConfig?: ReplicaMemberConfig;
135+
/**
136+
* Define a custom timeout for when out of some reason the binary cannot get started correctly
137+
* Time in MS
138+
* @default 10000 10 seconds
139+
*/
140+
launchTimeout?: number;
135141
}
136142

137143
export interface MongoMemoryInstanceOpts extends MongoMemoryInstanceOptsBase {
@@ -166,12 +172,6 @@ export interface MongoMemoryInstanceOpts extends MongoMemoryInstanceOptsBase {
166172
* @default undefined
167173
*/
168174
keyfileLocation?: string;
169-
/**
170-
* Define a custom timeout for when out of some reason the binary cannot get started correctly
171-
* Time in MS
172-
* @default 10000 10 seconds
173-
*/
174-
launchTimeout?: number;
175175
}
176176

177177
export enum MongoInstanceEvents {

0 commit comments

Comments
 (0)