mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use import syntax for logger and config

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-12 13:11:06 +02:00
parent dd11483f44
commit 9f284b752b
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
14 changed files with 98 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

75
lib/app.ts
View file

@ -1,46 +1,39 @@
'use strict'
import { Revision, sequelize } from './models'
import { config } from './config'
import { logger } from './logger'
import { Revision } from "./models"
import { sequelize } from './models'
const express = require('express')
// app
// external modules
const express = require('express');
const ejs = require('ejs')
const passport = require('passport')
const methodOverride = require('method-override')
const cookieParser = require('cookie-parser')
const compression = require('compression')
const session = require('express-session')
const SequelizeStore = require('connect-session-sequelize')(session.Store)
const fs = require('fs')
const path = require('path')
const ejs = require('ejs');
const passport = require('passport');
const methodOverride = require('method-override');
const cookieParser = require('cookie-parser');
const compression = require('compression');
const session = require('express-session');
const SequelizeStore = require('connect-session-sequelize')(session.Store);
const fs = require('fs');
const path = require('path');
const morgan = require('morgan');
const passportSocketIo = require('passport.socketio');
const helmet = require('helmet');
const i18n = require('i18n');
const flash = require('connect-flash');
// core
const config = require('./config');
const logger = require('./logger');
const errors = require('./errors');
const csp = require('./csp');
const morgan = require('morgan')
const passportSocketIo = require('passport.socketio')
const helmet = require('helmet')
const i18n = require('i18n')
const flash = require('connect-flash')
const errors = require('./errors')
const csp = require('./csp')
// server setup
const app = express();
let server: any = null;
const app = express()
let server: any = null
if (config.useSSL) {
const ca = (function () {
let i, len, results;
let i, len, results
results = []
for (i = 0, len = config.sslCAPath.length; i < len; i++) {
results.push(fs.readFileSync(config.sslCAPath[i], 'utf8'))
}
return results
})();
})()
const options = {
key: fs.readFileSync(config.sslKeyPath, 'utf8'),
cert: fs.readFileSync(config.sslCertPath, 'utf8'),
@ -48,7 +41,7 @@ if (config.useSSL) {
dhparam: fs.readFileSync(config.dhParamPath, 'utf8'),
requestCert: false,
rejectUnauthorized: false
};
}
server = require('https').createServer(options, app)
} else {
server = require('http').createServer(app)
@ -64,14 +57,14 @@ app.use(morgan('combined', {
}))
// socket io
const io = require('socket.io')(server);
const io = require('socket.io')(server)
io.engine.ws = new (require('ws').Server)({
noServer: true,
perMessageDeflate: false
})
// others
const realtime = require('./realtime');
const realtime = require('./realtime')
// assign socket io to realtime
realtime.io = io
@ -82,7 +75,7 @@ app.use(methodOverride('_method'))
// session store
const sessionStore = new SequelizeStore({
db: sequelize
});
})
// compression
app.use(compression())
@ -152,7 +145,7 @@ app.use(session({
}))
// session resumption
const tlsSessionStore = {};
const tlsSessionStore = {}
server.on('newSession', function (id, data, cb) {
tlsSessionStore[id.toString('hex')] = data
cb()
@ -243,12 +236,12 @@ io.sockets.on('connection', realtime.connection)
// listen
function startListen () {
let address;
let address
const listenCallback = function () {
const schema = config.useSSL ? 'HTTPS' : 'HTTP';
const schema = config.useSSL ? 'HTTPS' : 'HTTP'
logger.info('%s Server listening at %s', schema, address)
realtime.maintenance = false
};
}
// use unix domain socket if 'path' is specified
if (config.path) {
@ -287,7 +280,7 @@ function handleTermSignals () {
realtime.maintenance = true
// disconnect all socket.io clients
Object.keys(io.sockets.sockets).forEach(function (key) {
const socket = io.sockets.sockets[key];
const socket = io.sockets.sockets[key]
// notify client server going into maintenance status
socket.emit('maintenance')
setTimeout(function () {
@ -307,7 +300,7 @@ function handleTermSignals () {
}
})
}
}, 100);
}, 100)
}
process.on('SIGINT', handleTermSignals)
process.on('SIGTERM', handleTermSignals)