Эх сурвалжийг харах

prettier: convert individual decaffeinated files to Prettier format

Tim Alby 6 жил өмнө
parent
commit
36a899fd2f

+ 66 - 51
services/notifications/app.js

@@ -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");
-metrics.initialize("notifications");
-const Settings = require('settings-sharelatex');
-const logger = require('logger-sharelatex');
-logger.initialize("notifications-sharelatex");
-const express = require('express');
-const app = express();
-const controller = require("./app/js/NotificationsController");
-const mongojs = require('mongojs');
-const db = mongojs(Settings.mongo.url, ['notifications']);
-const Path = require("path");
-
-metrics.memory.monitor(logger);
-
-const HealthCheckController = require("./app/js/HealthCheckController");
-
-app.configure(function(){
-	app.use(express.methodOverride());
-	app.use(express.bodyParser());
-	app.use(metrics.http.monitor(logger));
-	return app.use(express.errorHandler());
-});
-
-metrics.injectMetricsRoute(app);
-
-app.post('/user/:user_id', controller.addNotification);
-app.get('/user/:user_id', controller.getUserNotifications);
-app.del('/user/:user_id/notification/:notification_id', 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('/health_check', (req, res)=>
-	HealthCheckController.check(function(err){
-		if (err != null) {
-			logger.err({err}, "error performing health check");
-			return res.send(500);
-		} else {
-			return res.send(200);
-		}
-	})
-);
-
-app.get('*', (req, res)=> res.send(404));
-
-const host = __guard__(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}`));
+const metrics = require('metrics-sharelatex')
+metrics.initialize('notifications')
+const Settings = require('settings-sharelatex')
+const logger = require('logger-sharelatex')
+logger.initialize('notifications-sharelatex')
+const express = require('express')
+const app = express()
+const controller = require('./app/js/NotificationsController')
+const mongojs = require('mongojs')
+const db = mongojs(Settings.mongo.url, ['notifications'])
+const Path = require('path')
+
+metrics.memory.monitor(logger)
+
+const HealthCheckController = require('./app/js/HealthCheckController')
+
+app.configure(function() {
+  app.use(express.methodOverride())
+  app.use(express.bodyParser())
+  app.use(metrics.http.monitor(logger))
+  return app.use(express.errorHandler())
+})
+
+metrics.injectMetricsRoute(app)
+
+app.post('/user/:user_id', controller.addNotification)
+app.get('/user/:user_id', controller.getUserNotifications)
+app.del(
+  '/user/:user_id/notification/:notification_id',
+  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('/health_check', (req, res) =>
+  HealthCheckController.check(function(err) {
+    if (err != null) {
+      logger.err({ err }, 'error performing health check')
+      return res.send(500)
+    } else {
+      return res.send(200)
+    }
+  })
+)
+
+app.get('*', (req, res) => res.send(404))
+
+const host =
+  __guard__(
+    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
+}

+ 14 - 12
services/notifications/config/settings.defaults.js

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