From 565281e765cb9e5f5c10ac37c8ee03f42ecc1874 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 2 Aug 2017 21:09:54 -0400 Subject: [PATCH] Revert "Add mongo-dev-server package (#8853)" This reverts commit 4d37a05fb33576b8f167168f4bc1b12821354615. After git bisecting between origin/release-1.5 and origin/release-1.5.2, I identified this commit as the culprit in recent failures of the modules test app: https://circleci.com/gh/meteor/meteor/4857#tests/containers/3 Note that the modules test app seems to be failing only on Linux, and it does pass reliably with this commit reverted. It must have something to do with Mongo failing to start, and thus the "App running at" message never appears, but I don't have a good theory why that might be. The command to run just the modules test app is meteor self-test --history 1000 'modules - test app' @zimme @hwillson @abernix any ideas? --- History.md | 12 ------------ packages/mongo-dev-server/README.md | 18 ------------------ packages/mongo-dev-server/package.js | 12 ------------ packages/mongo-dev-server/server.js | 3 --- packages/mongo/package.js | 3 +-- tools/runners/run-all.js | 19 +------------------ 6 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 packages/mongo-dev-server/README.md delete mode 100644 packages/mongo-dev-server/package.js delete mode 100644 packages/mongo-dev-server/server.js diff --git a/History.md b/History.md index 967f476a74..4b32985f86 100644 --- a/History.md +++ b/History.md @@ -30,18 +30,6 @@ root of the bundle, but it may be deprecated in a future version of Meteor. [PR #8956](https://github.com/meteor/meteor/pull/8956) -* A new package called `mongo-dev-server` has been created and wired into - `mongo` as a dependency. As long as this package is included in a Meteor - application (which it is by default since all new Meteor apps have `mongo` - as a dependency), a local development MongoDB server is started alongside - the application. This package was created to provide a way to disable the - local development Mongo server, when `mongo` isn't needed (e.g. when using - Meteor as a build system only). If an application has no dependency on - `mongo`, the `mongo-dev-server` package is not added, which means no local - development Mongo server is started. - [Feature Request #31](https://github.com/meteor/meteor-feature-requests/issues/31) - [PR #8853](https://github.com/meteor/meteor/pull/8853) - * `Accounts.config` no longer mistakenly allows tokens to expire when the `loginExpirationInDays` option is set to `null`. [Issue #5121](https://github.com/meteor/meteor/issues/5121) diff --git a/packages/mongo-dev-server/README.md b/packages/mongo-dev-server/README.md deleted file mode 100644 index 44609c29b5..0000000000 --- a/packages/mongo-dev-server/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# mongo-dev-server - -[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mongo-dev-server) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mongo-dev-server) -*** - -When the `mongo-dev-server` package is included in a Meteor application, a -local development MongoDB server is started alongside the application. This -package is mostly used internally, as it is included by default with any -application that has a dependency on `mongo` (which is most Meteor -applications). In some cases however, people might be interested in -using the Meteor Tool without having to start a local development Mongo -instance (e.g. when using Meteor as a build system). If an application has no -dependency on `mongo`, the `mongo-dev-server` package will be removed -(since it is a direct dependency of the `mongo` package), and no local -development Mongo server will be started. - -Note this is a `debugOnly` package, meaning it will not be included in any -production bundles. diff --git a/packages/mongo-dev-server/package.js b/packages/mongo-dev-server/package.js deleted file mode 100644 index bf75976d23..0000000000 --- a/packages/mongo-dev-server/package.js +++ /dev/null @@ -1,12 +0,0 @@ -Package.describe({ - debugOnly: true, - documentation: 'README.md', - name: 'mongo-dev-server', - summary: 'Start MongoDB alongside Meteor, in development mode.', - version: '1.0.1-beta152.7', -}); - -Package.onUse(function (api) { - api.use('modules'); - api.mainModule('server.js', 'server'); -}); diff --git a/packages/mongo-dev-server/server.js b/packages/mongo-dev-server/server.js deleted file mode 100644 index 74643cab71..0000000000 --- a/packages/mongo-dev-server/server.js +++ /dev/null @@ -1,3 +0,0 @@ -if (process.env.MONGO_URL === 'no-mongo-server') { - Meteor._debug('Note: Restart Meteor to start the MongoDB server.'); -} diff --git a/packages/mongo/package.js b/packages/mongo/package.js index abd6da9650..1c9c4689be 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -34,8 +34,7 @@ Package.onUse(function (api) { 'diff-sequence', 'mongo-id', 'check', - 'ecmascript', - 'mongo-dev-server', + 'ecmascript' ]); // Binary Heap data structure is used to optimize oplog observe driver diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js index 2da15c02a6..da225fe8c6 100644 --- a/tools/runners/run-all.js +++ b/tools/runners/run-all.js @@ -71,20 +71,10 @@ class Runner { onFailure }); - buildmessage.capture(function () { - self.projectContext.resolveConstraints(); - }); - - const packageMap = self.projectContext.packageMap; - const hasMongoDevServerPackage = - packageMap && packageMap.getInfo('mongo-dev-server') != null; self.mongoRunner = null; if (mongoUrl) { oplogUrl = disableOplog ? null : oplogUrl; - } else if (hasMongoDevServerPackage - || process.env.METEOR_TEST_FAKE_MONGOD_CONTROL_PORT) { - // The mongo-dev-server package is required to start Mongo, but - // tests using fake-mongod are exempted. + } else { self.mongoRunner = new MongoRunner({ projectLocalDir: self.projectContext.projectLocalDir, port: mongoPort, @@ -96,13 +86,6 @@ class Runner { mongoUrl = self.mongoRunner.mongoUrl(); oplogUrl = disableOplog ? null : self.mongoRunner.oplogUrl(); - } else { - // Don't start a mongodb server. - // Set monogUrl to a specific value to prevent MongoDB connections - // and to allow a check for printing a message if `mongo-dev-server` - // is added while the app is running. - // The check and message is printed by the `mongo-dev-server` package. - mongoUrl = 'no-mongo-server'; } self.updater = new Updater();