joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Long Nguyen
2016-03-06 01:37:12 +07:00
parent 4f643d970a 930e8422b5
commit fcc8032e4c
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -55,11 +55,11 @@
"nodemon": "^1.8.1" "nodemon": "^1.8.1"
}, },
"scripts": { "scripts": {
"dev": "npm run build && bin/dev", "dev": "npm run build && node bin/dev",
"build": "./node_modules/.bin/babel src/ -d lib/", "build": "./node_modules/.bin/babel src/ -d lib/",
"pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.0.8} ./node_modules/.bin/mongodb-runner start", "pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.0.8} ./node_modules/.bin/mongodb-runner start",
"test": "cross-env NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node $COVERAGE_OPTION ./node_modules/jasmine/bin/jasmine.js", "test": "cross-env NODE_ENV=test TESTING=1 ./node_modules/.bin/babel-node $COVERAGE_OPTION ./node_modules/jasmine/bin/jasmine.js",
"posttest": "mongodb-runner stop", "posttest": "./node_modules/.bin/mongodb-runner stop",
"coverage": "cross-env COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' npm test", "coverage": "cross-env COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' npm test",
"start": "node ./bin/parse-server", "start": "node ./bin/parse-server",
"prepublish": "npm run build" "prepublish": "npm run build"

21
src/index.js
View File

@@ -232,15 +232,18 @@ function ParseServer({
api.use(middlewares.handleParseErrors); api.use(middlewares.handleParseErrors);
process.on('uncaughtException', (err) => { //This causes tests to spew some useless warnings, so disable in test
if( err.code === "EADDRINUSE" ) { // user-friendly message for this common error if (!process.env.TESTING) {
console.log(`Unable to listen on port ${err.port}. The port is already in use.`); process.on('uncaughtException', (err) => {
process.exit(0); if( err.code === "EADDRINUSE" ) { // user-friendly message for this common error
} console.log(`Unable to listen on port ${err.port}. The port is already in use.`);
else { process.exit(0);
throw err; }
} else {
}); throw err;
}
});
}
hooksController.load(); hooksController.load();
return api; return api;