Apply PR practicalmeteor#68 to code

englue · Jan 31, 2017 · 501ab40 · 501ab40
1 parent c7a5775
commit 501ab40
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Cakefile b/Cakefile
@@ -1,3 +1,5 @@
+require 'coffee-script/register'
+
 ChildProcess = require './lib/ChildProcess'
 
 mochaCmdLine = "mocha --colors --compilers coffee:coffee-script/register --reporter spec tests/lib/*Test.coffee"

diff --git a/lib/Meteor.coffee b/lib/Meteor.coffee
@@ -187,7 +187,6 @@ class Meteor extends EventEmitter
   hasStartedMongoDBText: (buffer)=>
     if buffer.lastIndexOf('Started MongoDB') isnt -1
       @mongodb = new MeteorMongodb(@childProcess.child.pid)
-      @emit "mongodb ready"
 
 
   hasErrorText: (buffer)=>

diff --git a/lib/MeteorMongodb.coffee b/lib/MeteorMongodb.coffee
@@ -30,12 +30,13 @@ class MeteorMongodb extends EventEmitter
       ppid: @meteorPid
     , (err, resultList )=>
       @mongodChilds = resultList
-      if (err)
+      if (err || resultList.length == 0)
         log.warn "spacjam: Warning: Couldn't find any mongod children:\n", err
       else if resultList.length > 1
         log.warn "spacjam: Warning: Found more than one mongod child:\n", resultList
       else
         log.debug "Found meteor mongod child with pid: ", resultList[0].pid
+      @emit "mongodb ready"
 
 
   kill: ->

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spacejam",
-  "version": "1.6.1",
+  "version": "1.6.1-pr68",
   "dependencies": {
     "chai": "1.9.2",
     "glob": "4.0.6",