Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #281 from havfo/fix-oidc 

Fix oidc
auto_join_3.3
Mészáros Mihály 2020-05-05 08:55:33 +02:00 committed by GitHub
parent e039423dd5 a46de5ff54
commit 2b3ebe8eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/server.js
View File

@ -35,6 +35,7 @@ const RedisStore = require('connect-redis')(expressSession);
const sharedSession = require('express-socket.io-session'); const sharedSession = require('express-socket.io-session');
const interactiveServer = require('./lib/interactiveServer'); const interactiveServer = require('./lib/interactiveServer');
const promExporter = require('./lib/promExporter'); const promExporter = require('./lib/promExporter');
const { v4: uuidv4 } = require('uuid');
/* eslint-disable no-console */ /* eslint-disable no-console */
console.log('- process.env.DEBUG:', process.env.DEBUG); console.log('- process.env.DEBUG:', process.env.DEBUG);
@ -157,6 +158,25 @@ async function run()
// Run WebSocketServer. // Run WebSocketServer.
await runWebSocketServer(); await runWebSocketServer();
// eslint-disable-next-line no-unused-vars
function errorHandler(err, req, res, next)
{
const trackingId = uuidv4();
res.status(500).send(
`<h1>Internal Server Error</h1>
<p>If you report this error, please also report this
<i>tracking ID</i> which makes it possible to locate your session
in the logs which are available to the system administrator:
<b>${trackingId}</b></p>`
);
logger.error(
'Express error handler dump with tracking ID: %s, error dump: %o',
trackingId, err);
}
app.use(errorHandler);
// Log rooms status every 30 seconds. // Log rooms status every 30 seconds.
setInterval(() => setInterval(() =>
{ {