diff --git a/src/api/Server.ts b/src/api/Server.ts
index 472ab1d6..e4b62b5f 100644
--- a/src/api/Server.ts
+++ b/src/api/Server.ts
@@ -18,22 +18,21 @@
import {
Config,
+ ConnectionConfig,
+ ConnectionLoader,
Email,
- initDatabase,
- initEvent,
JSONReplacer,
- registerRoutes,
Sentry,
WebAuthn,
- ConnectionConfig,
- ConnectionLoader,
+ initDatabase,
+ initEvent,
+ registerRoutes,
+ setupMorganLogging,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { Server, ServerOptions } from "lambert-server";
import "missing-native-js-functions";
-import morgan from "morgan";
import path from "path";
-import { red } from "picocolors";
import { Authentication, CORS } from "./middlewares/";
import { BodyParser } from "./middlewares/BodyParser";
import { ErrorHandler } from "./middlewares/ErrorHandler";
@@ -79,23 +78,7 @@ export class SpacebarServer extends Server {
await Sentry.init(this.app);
WebAuthn.init();
- const logRequests = process.env["LOG_REQUESTS"] != undefined;
- if (logRequests) {
- this.app.use(
- morgan("combined", {
- skip: (req, res) => {
- let skip = !(
- process.env["LOG_REQUESTS"]?.includes(
- res.statusCode.toString(),
- ) ?? false
- );
- if (process.env["LOG_REQUESTS"]?.charAt(0) == "-")
- skip = !skip;
- return skip;
- },
- }),
- );
- }
+ setupMorganLogging(this.app);
this.app.set("json replacer", JSONReplacer);
@@ -147,13 +130,6 @@ export class SpacebarServer extends Server {
ConnectionLoader.loadConnections();
- if (logRequests)
- console.log(
- red(
- `Warning: Request logging is enabled! This will spam your console!\nTo disable this, unset the 'LOG_REQUESTS' environment variable!`,
- ),
- );
-
return super.start();
}
}
diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts
index 6a2f65de..851e8b2c 100644
--- a/src/api/routes/-/healthz.ts
+++ b/src/api/routes/-/healthz.ts
@@ -16,14 +16,14 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Router, Response, Request } from "express";
import { route } from "@spacebar/api";
-import { getDatabase } from "@spacebar/util";
+import { Datasource } from "@spacebar/util";
+import { Request, Response, Router } from "express";
const router = Router();
router.get("/", route({}), (req: Request, res: Response) => {
- if (!getDatabase()) return res.sendStatus(503);
+ if (!Datasource.isInitialized) return res.sendStatus(503);
return res.sendStatus(200);
});
diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts
index 6a2f65de..851e8b2c 100644
--- a/src/api/routes/-/readyz.ts
+++ b/src/api/routes/-/readyz.ts
@@ -16,14 +16,14 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { Router, Response, Request } from "express";
import { route } from "@spacebar/api";
-import { getDatabase } from "@spacebar/util";
+import { Datasource } from "@spacebar/util";
+import { Request, Response, Router } from "express";
const router = Router();
router.get("/", route({}), (req: Request, res: Response) => {
- if (!getDatabase()) return res.sendStatus(503);
+ if (!Datasource.isInitialized) return res.sendStatus(503);
return res.sendStatus(200);
});
|
