scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #234 from LLK/develop

Browse source 
Sentry hotfix
This commit is contained in:
Ray Schamp 2015-11-12 17:34:06 -05:00
commit b32019ab5f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/config.js
View file

@ -19,7 +19,7 @@ module.exports = {
ga_tracker: process.env.GA_TRACKER || '',
// Error handling
sentry_dsn: process.env.SENTRY_DSN || '',
sentry_dsn: process.env.CLIENT_SENTRY_DSN || '',
// Use minified JS libraries
min: (process.env.NODE_ENV === 'production') ? '.min' : ''

8
server/index.js
View file

@ -47,20 +47,20 @@ for (var routeId in routes) {
app.get(route.pattern, handler(route));
}
if (typeof process.env.SENTRY_DSN === 'string') {
if (typeof process.env.NODE_SENTRY_DSN === 'string') {
var raven = require('raven');
app.get('/sentrythrow', function mainHandler () { throw new Error('Sentry Test'); });
// These handlers must be applied _AFTER_ other routes have been applied
app.use(raven.middleware.express.requestHandler(process.env.SENTRY_DSN));
app.use(raven.middleware.express.errorHandler(process.env.SENTRY_DSN));
app.use(raven.middleware.express.requestHandler(process.env.NODE_SENTRY_DSN));
app.use(raven.middleware.express.errorHandler(process.env.NODE_SENTRY_DSN));
app.use(function errorHandler (err, req, res, next) {
res.append('X-Sentry-ID:' + res.sentry);
res.status(500);
next(err);
});
raven.patchGlobal(process.env.SENTRY_DSN, function () {
raven.patchGlobal(process.env.NODE_SENTRY_DSN, function () {
process.exit(-1);
});
}