prettier: convert individual decaffeinated files to Prettier format

This commit is contained in:
Tim Alby 2020-01-13 20:01:23 +01:00
parent 30860286c3
commit 36a899fd2f
2 changed files with 71 additions and 54 deletions

View file

@ -5,56 +5,71 @@
* DS207: Consider shorter variations of null checks * DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/ */
const metrics = require("metrics-sharelatex"); const metrics = require('metrics-sharelatex')
metrics.initialize("notifications"); metrics.initialize('notifications')
const Settings = require('settings-sharelatex'); const Settings = require('settings-sharelatex')
const logger = require('logger-sharelatex'); const logger = require('logger-sharelatex')
logger.initialize("notifications-sharelatex"); logger.initialize('notifications-sharelatex')
const express = require('express'); const express = require('express')
const app = express(); const app = express()
const controller = require("./app/js/NotificationsController"); const controller = require('./app/js/NotificationsController')
const mongojs = require('mongojs'); const mongojs = require('mongojs')
const db = mongojs(Settings.mongo.url, ['notifications']); const db = mongojs(Settings.mongo.url, ['notifications'])
const Path = require("path"); const Path = require('path')
metrics.memory.monitor(logger); metrics.memory.monitor(logger)
const HealthCheckController = require("./app/js/HealthCheckController"); const HealthCheckController = require('./app/js/HealthCheckController')
app.configure(function(){ app.configure(function() {
app.use(express.methodOverride()); app.use(express.methodOverride())
app.use(express.bodyParser()); app.use(express.bodyParser())
app.use(metrics.http.monitor(logger)); app.use(metrics.http.monitor(logger))
return app.use(express.errorHandler()); return app.use(express.errorHandler())
}); })
metrics.injectMetricsRoute(app); metrics.injectMetricsRoute(app)
app.post('/user/:user_id', controller.addNotification); app.post('/user/:user_id', controller.addNotification)
app.get('/user/:user_id', controller.getUserNotifications); app.get('/user/:user_id', controller.getUserNotifications)
app.del('/user/:user_id/notification/:notification_id', controller.removeNotificationId); app.del(
app.del('/user/:user_id', controller.removeNotificationKey); '/user/:user_id/notification/:notification_id',
app.del('/key/:key', controller.removeNotificationByKeyOnly); controller.removeNotificationId
)
app.del('/user/:user_id', controller.removeNotificationKey)
app.del('/key/:key', controller.removeNotificationByKeyOnly)
app.get('/status', (req, res)=> res.send('notifications sharelatex up')); app.get('/status', (req, res) => res.send('notifications sharelatex up'))
app.get('/health_check', (req, res)=> app.get('/health_check', (req, res) =>
HealthCheckController.check(function(err){ HealthCheckController.check(function(err) {
if (err != null) { if (err != null) {
logger.err({err}, "error performing health check"); logger.err({ err }, 'error performing health check')
return res.send(500); return res.send(500)
} else { } else {
return res.send(200); return res.send(200)
} }
}) })
); )
app.get('*', (req, res)=> res.send(404)); app.get('*', (req, res) => res.send(404))
const host = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x => x.host) || "localhost"; const host =
const port = __guard__(Settings.internal != null ? Settings.internal.notifications : undefined, x1 => x1.port) || 3042; __guard__(
app.listen(port, host, () => logger.info(`notifications starting up, listening on ${host}:${port}`)); Settings.internal != null ? Settings.internal.notifications : undefined,
x => x.host
) || 'localhost'
const port =
__guard__(
Settings.internal != null ? Settings.internal.notifications : undefined,
x1 => x1.port
) || 3042
app.listen(port, host, () =>
logger.info(`notifications starting up, listening on ${host}:${port}`)
)
function __guard__(value, transform) { function __guard__(value, transform) {
return (typeof value !== 'undefined' && value !== null) ? transform(value) : undefined; return typeof value !== 'undefined' && value !== null
? transform(value)
: undefined
} }

View file

@ -1,13 +1,15 @@
let Settings; let Settings
module.exports = (Settings = { module.exports = Settings = {
internal: { internal: {
notifications: { notifications: {
port: 3042, port: 3042,
host: process.env["LISTEN_ADDRESS"] || "localhost" host: process.env.LISTEN_ADDRESS || 'localhost'
} }
}, },
mongo: { mongo: {
url: process.env['MONGO_CONNECTION_STRING'] || `mongodb://${process.env["MONGO_HOST"] || "localhost"}/sharelatex` url:
} process.env.MONGO_CONNECTION_STRING ||
}); `mongodb://${process.env.MONGO_HOST || 'localhost'}/sharelatex`
}
}