From e66b5c57c68a336494539045a78a63275119f3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 27 Jun 2017 13:29:14 +0200 Subject: [PATCH 1/3] Fix getMongodStartedExpression for newer versions Newer versions of mongod don't print "wating for connections" (or it's now a debug message) This line seems to indicate mongod is ready --- src/mongod-helper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mongod-helper.ts b/src/mongod-helper.ts index 453f9f2..38c90cd 100644 --- a/src/mongod-helper.ts +++ b/src/mongod-helper.ts @@ -73,7 +73,7 @@ export class MongodHelper { } getMongodStartedExpression(): RegExp { - return /waiting for connections on port/i; + return /\[initandlisten\] setting featureCompatibilityVersion/i; } getMongodAlreadyRunningExpression(): RegExp { From 0ec43991181e66587a690fc03c2a2ea2320c3bf5 Mon Sep 17 00:00:00 2001 From: mkg20001 Date: Sun, 13 Aug 2017 14:55:57 +0200 Subject: [PATCH 2/3] Check for both expressions --- built/mongod-helper.d.ts | 1 + built/mongod-helper.js | 8 ++++++-- built/mongod-helper.js.map | 2 +- package.json | 6 +++--- src/mongod-helper.ts | 19 ++++++++++++------- tsconfig.json | 2 +- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/built/mongod-helper.d.ts b/built/mongod-helper.d.ts index 0ed4fd0..80d9545 100644 --- a/built/mongod-helper.d.ts +++ b/built/mongod-helper.d.ts @@ -11,6 +11,7 @@ export declare class MongodHelper { stderrHandler(message: string | Buffer): void; stdoutHandler(message: string | Buffer): void; getMongodStartedExpression(): RegExp; + getMongodStartedExpression2(): RegExp; getMongodAlreadyRunningExpression(): RegExp; getMongodPermissionDeniedExpression(): RegExp; getMongodDataDirNotFounddExpression(): RegExp; diff --git a/built/mongod-helper.js b/built/mongod-helper.js index 1174104..76d7a66 100644 --- a/built/mongod-helper.js +++ b/built/mongod-helper.js @@ -33,11 +33,12 @@ var MongodHelper = (function () { this.debug("mongod stdout: " + message); var log = message.toString(); var mongodStartExpression = this.getMongodStartedExpression(); + var mongodStartExpression2 = this.getMongodStartedExpression2(); var mongodAlreadyRunningExpression = this.getMongodAlreadyRunningExpression(); var mongodPermissionDeniedExpression = this.getMongodPermissionDeniedExpression(); var mongodDataDirNotFounddExpression = this.getMongodDataDirNotFounddExpression(); var mongodShutdownMessageExpression = this.getMongodShutdownMessageExpression(); - if (mongodStartExpression.test(log)) { + if (mongodStartExpression.test(log) || mongodStartExpression2.test(log)) { this.resolveLink(true); } if (mongodAlreadyRunningExpression.test(log)) { @@ -59,6 +60,9 @@ var MongodHelper = (function () { MongodHelper.prototype.getMongodStartedExpression = function () { return /waiting for connections on port/i; }; + MongodHelper.prototype.getMongodStartedExpression2 = function () { + return /\[initandlisten\] setting featureCompatibilityVersion/i; + }; MongodHelper.prototype.getMongodAlreadyRunningExpression = function () { return /mongod instance already running/i; }; @@ -74,4 +78,4 @@ var MongodHelper = (function () { return MongodHelper; }()); exports.MongodHelper = MongodHelper; -//# sourceMappingURL=/Users/winfinit/workspace/personal/mongodb-prebuilt/mongod-helper.js.map \ No newline at end of file +//# sourceMappingURL=/Users/winfinit/workspace/personal/mongodb-prebuilt/mongod-helper.js.map diff --git a/built/mongod-helper.js.map b/built/mongod-helper.js.map index 0bbbea5..76c389a 100644 --- a/built/mongod-helper.js.map +++ b/built/mongod-helper.js.map @@ -1 +1 @@ -{"version":3,"file":"mongod-helper.js","sourceRoot":"","sources":["src/mongod-helper.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mongod-helper.js","sourceRoot":"","sources":["src/mongod-helper.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index d7825dc..cb58769 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "mongodb-prebuilt", "version": "6.3.3", "description": "Install MongoDB prebuilt binaries via npm", - "main": "built/mongodb-prebuilt-all", - "types": "built/mongodb-prebuilt-all.d.ts", + "main": "built/mongodb-prebuilt-all", + "types": "built/mongodb-prebuilt-all.d.ts", "scripts": { "cache-clean": "rm -rf dist *.txt" }, @@ -53,7 +53,7 @@ "devDependencies": { "@types/node": "^6.0.58", "mocha": "^3.2.0", - "chai": "^3.5.0" + "chai": "^3.5.0" }, "homepage": "https://github.com/winfinit/mongodb-prebuilt#readme" } diff --git a/src/mongod-helper.ts b/src/mongod-helper.ts index 38c90cd..00bd6cb 100644 --- a/src/mongod-helper.ts +++ b/src/mongod-helper.ts @@ -6,20 +6,20 @@ const COMMAND: string = "mongod"; export class MongodHelper { mongoBin: MongoBins; debug: any; - + private resolveLink: (response: boolean) => void = () => {}; private rejectLink: (response: string) => void = () => {}; - + constructor(commandArguments: string[] = []) { this.mongoBin = new MongoBins(COMMAND, commandArguments); this.debug = Debug(`mongodb-prebuilt-MongodHelper`); } - + run(): Promise { return new Promise((resolve, reject) => { this.resolveLink = resolve; this.rejectLink = reject; - + this.mongoBin.run().then(() => { this.mongoBin.childProcess.stderr.on('data', (data) => this.stderrHandler(data)); this.mongoBin.childProcess.stdout.on('data', (data) => this.stdoutHandler(data)); @@ -35,18 +35,19 @@ export class MongodHelper { stderrHandler(message: string | Buffer): void { this.debug(`mongod stderr: ${message}`); } - + stdoutHandler(message: string | Buffer): void { this.debug(`mongod stdout: ${message}`); let log: string = message.toString(); let mongodStartExpression: RegExp = this.getMongodStartedExpression(); + let mongodStartExpression2: RegExp = this.getMongodStartedExpression2(); let mongodAlreadyRunningExpression: RegExp = this.getMongodAlreadyRunningExpression(); let mongodPermissionDeniedExpression: RegExp = this.getMongodPermissionDeniedExpression(); let mongodDataDirNotFounddExpression: RegExp = this.getMongodDataDirNotFounddExpression(); let mongodShutdownMessageExpression: RegExp = this.getMongodShutdownMessageExpression(); - - if ( mongodStartExpression.test(log) ) { + + if ( mongodStartExpression.test(log) || mongodStartExpression2.test(log) ) { this.resolveLink(true); } @@ -73,6 +74,10 @@ export class MongodHelper { } getMongodStartedExpression(): RegExp { + return /waiting for connections on port/i; + } + + getMongodStartedExpression2(): RegExp { return /\[initandlisten\] setting featureCompatibilityVersion/i; } diff --git a/tsconfig.json b/tsconfig.json index 94af510..1c7813f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,4 +24,4 @@ "typings", "**/*.spec.ts" ] -} \ No newline at end of file +} From 59d7deda469e73d038f08891a1e627cbb1200106 Mon Sep 17 00:00:00 2001 From: mkg20001 Date: Sun, 13 Aug 2017 15:01:57 +0200 Subject: [PATCH 3/3] Rename expressions --- built/mongod-helper.d.ts | 4 ++-- built/mongod-helper.js | 12 ++++++------ built/mongod-helper.js.map | 2 +- src/mongod-helper.ts | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/built/mongod-helper.d.ts b/built/mongod-helper.d.ts index 80d9545..ff33392 100644 --- a/built/mongod-helper.d.ts +++ b/built/mongod-helper.d.ts @@ -10,8 +10,8 @@ export declare class MongodHelper { closeHandler(code: number): void; stderrHandler(message: string | Buffer): void; stdoutHandler(message: string | Buffer): void; - getMongodStartedExpression(): RegExp; - getMongodStartedExpression2(): RegExp; + getMongodStartedExpressionWindows(): RegExp; + getMongodStartedExpressionLinux(): RegExp; getMongodAlreadyRunningExpression(): RegExp; getMongodPermissionDeniedExpression(): RegExp; getMongodDataDirNotFounddExpression(): RegExp; diff --git a/built/mongod-helper.js b/built/mongod-helper.js index 76d7a66..bc1ad93 100644 --- a/built/mongod-helper.js +++ b/built/mongod-helper.js @@ -32,13 +32,13 @@ var MongodHelper = (function () { MongodHelper.prototype.stdoutHandler = function (message) { this.debug("mongod stdout: " + message); var log = message.toString(); - var mongodStartExpression = this.getMongodStartedExpression(); - var mongodStartExpression2 = this.getMongodStartedExpression2(); + var mongodStartExpressionWindows = this.getMongodStartedExpressionWindows(); + var mongodStartExpressionLinux = this.getMongodStartedExpressionLinux(); var mongodAlreadyRunningExpression = this.getMongodAlreadyRunningExpression(); var mongodPermissionDeniedExpression = this.getMongodPermissionDeniedExpression(); var mongodDataDirNotFounddExpression = this.getMongodDataDirNotFounddExpression(); var mongodShutdownMessageExpression = this.getMongodShutdownMessageExpression(); - if (mongodStartExpression.test(log) || mongodStartExpression2.test(log)) { + if (mongodStartExpressionWindows.test(log) || mongodStartExpressionLinux.test(log)) { this.resolveLink(true); } if (mongodAlreadyRunningExpression.test(log)) { @@ -57,10 +57,10 @@ var MongodHelper = (function () { return this.rejectLink('Mongod shutting down'); } }; - MongodHelper.prototype.getMongodStartedExpression = function () { + MongodHelper.prototype.getMongodStartedExpressionWindows = function () { return /waiting for connections on port/i; }; - MongodHelper.prototype.getMongodStartedExpression2 = function () { + MongodHelper.prototype.getMongodStartedExpressionLinux = function () { return /\[initandlisten\] setting featureCompatibilityVersion/i; }; MongodHelper.prototype.getMongodAlreadyRunningExpression = function () { @@ -78,4 +78,4 @@ var MongodHelper = (function () { return MongodHelper; }()); exports.MongodHelper = MongodHelper; -//# sourceMappingURL=/Users/winfinit/workspace/personal/mongodb-prebuilt/mongod-helper.js.map +//# sourceMappingURL=/Users/winfinit/workspace/personal/mongodb-prebuilt/mongod-helper.js.map \ No newline at end of file diff --git a/built/mongod-helper.js.map b/built/mongod-helper.js.map index 76c389a..f4d7526 100644 --- a/built/mongod-helper.js.map +++ b/built/mongod-helper.js.map @@ -1 +1 @@ -{"version":3,"file":"mongod-helper.js","sourceRoot":"","sources":["src/mongod-helper.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mongod-helper.js","sourceRoot":"","sources":["src/mongod-helper.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/mongod-helper.ts b/src/mongod-helper.ts index 00bd6cb..716b3fb 100644 --- a/src/mongod-helper.ts +++ b/src/mongod-helper.ts @@ -40,14 +40,14 @@ export class MongodHelper { this.debug(`mongod stdout: ${message}`); let log: string = message.toString(); - let mongodStartExpression: RegExp = this.getMongodStartedExpression(); - let mongodStartExpression2: RegExp = this.getMongodStartedExpression2(); + let mongodStartExpressionWindows: RegExp = this.getMongodStartedExpressionWindows(); + let mongodStartExpressionLinux: RegExp = this.getMongodStartedExpressionLinux(); let mongodAlreadyRunningExpression: RegExp = this.getMongodAlreadyRunningExpression(); let mongodPermissionDeniedExpression: RegExp = this.getMongodPermissionDeniedExpression(); let mongodDataDirNotFounddExpression: RegExp = this.getMongodDataDirNotFounddExpression(); let mongodShutdownMessageExpression: RegExp = this.getMongodShutdownMessageExpression(); - if ( mongodStartExpression.test(log) || mongodStartExpression2.test(log) ) { + if ( mongodStartExpressionWindows.test(log) || mongodStartExpressionLinux.test(log) ) { this.resolveLink(true); } @@ -73,11 +73,11 @@ export class MongodHelper { } - getMongodStartedExpression(): RegExp { + getMongodStartedExpressionWindows(): RegExp { return /waiting for connections on port/i; } - getMongodStartedExpression2(): RegExp { + getMongodStartedExpressionLinux(): RegExp { return /\[initandlisten\] setting featureCompatibilityVersion/i; }