Skip to content

Commit

Permalink
updating npm packages, adding long stack traces
Browse files Browse the repository at this point in the history
  • Loading branch information
btouellette committed Oct 26, 2016
1 parent 2c3e2a6 commit d8a25bd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion config/c9.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ process.env.FACEBOOK_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/fa
process.env.TWITTER_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/twitter/callback';
process.env.GOOGLE_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/google/callback';

process.env.MONGOLAB_URI = argv.MONGOLAB_URI || 'mongodb:https://' + process.env.IP + '/concarneau_db';
process.env.MONGOLAB_URI = /*argv.MONGOLAB_URI || */'mongodb:https://' + process.env.IP + '/concarneau_db';

process.env.SOCKET_URL = 'https://concarneau-c9-btouellette.c9.io';
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,38 @@
"dependencies": {
"@risingstack/trace": "^2.23.4",
"bcrypt-nodejs": "latest",
"body-parser": "~1.4.3",
"compression": "~1.0.8",
"body-parser": "^1.15.2",
"compression": "^1.6.2",
"connect-flash": "~0.1.1",
"connect-mongo": "~0.8.2",
"connect-timeout": "^1.7.0",
"cookie": "~0.1.2",
"cookie-parser": "~1.3.1",
"cookie": "^0.3.1",
"cookie-parser": "^1.4.3",
"ejs": "~1.0.0",
"express": "~4.4.4",
"express-session": "~1.5.1",
"long-stack-traces": "^0.1.2",
"mongoose": "^4.6.4",
"mongoose": "^4.6.5",
"moniker": "~0.1.2",
"newrelic": "^1.31.0",
"nodemailer": "^2.5.0",
"nodemailer-smtp-transport": "^2.5.0",
"nodetime": "^0.8.17",
"passport": "~0.2.0",
"passport-facebook": "~1.0.3",
"passport-google-oauth": "~0.1.5",
"passport-local": "~1.0.0",
"passport-twitter": "~1.0.2",
"q": "~1.0.1",
"raven": "^0.12.1",
"socket.io": "~1.0.6",
"socket.io": "^1.5.1",
"spm-agent-nodejs": "^1.30.2",
"tunnel": "0.0.3",
"twit": "~1.1.15",
"xoauth2": "^1.2.0",
"yargs": "~1.2.6"
},
"devDependencies": {
"eslint": "^1.9.0"
"eslint": "^3.8.1"
},
"scripts": {
"lint": "eslint app"
Expand Down
11 changes: 6 additions & 5 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// set up ======================================================================

// if this is a c9 project using argv rather than environment variable run configurations configure appropriately
if(process.env.C9_PROJECT && !process.env.MONGOLAB_URI) {
if(process.env.C9_PROJECT/* && !process.env.MONGOLAB_URI*/) {
require('./config/c9');
}

Expand All @@ -20,10 +20,10 @@ if(process.env.SPM_TOKEN) {
require ('spm-agent-nodejs');
}
if(process.env.NODETIME_ACCOUNT_KEY) {
require('nodetime').profile({
accountKey: process.env.NODETIME_ACCOUNT_KEY,
appName: 'Concarneau'
});
require('nodetime').profile({
accountKey: process.env.NODETIME_ACCOUNT_KEY,
appName: 'Concarneau'
});
}

var port = process.env.PORT || 8080;
Expand All @@ -37,6 +37,7 @@ if(process.env.HTTP_PROXY) {
}

// get all the tools we need
require('long-stack-traces');
var express = require('express');
var app = express();
var cookieParser = require('cookie-parser');
Expand Down
2 changes: 1 addition & 1 deletion views/game.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
</div>
</div>
<script src="/content/js/standalone.js"></script>
<script src="https://cdn.socket.io/socket.io-1.0.6.js"></script>
<script src="https://cdn.socket.io/socket.io-1.4.5.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.4.8/d3.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/qtip2/2.2.0/jquery.qtip.min.js"></script>
Expand Down

0 comments on commit d8a25bd

Please sign in to comment.