don't log metrics for postgres in testing

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

packages/backend/scripts/check_connect.js

@@ -7,11 +7,6 @@ import Redis from 'ioredis';
 import { loadConfig } from '../built/config.js';
 import { createPostgresDataSource } from '../built/postgres.js';
 
-const timeout = setTimeout(() => {
-	console.error('Timeout while connecting to databases.');
-	process.exit(1);
-}, 120000);
-
 const config = loadConfig();
 
 async function connectToPostgres() {
@@ -59,5 +54,3 @@ const promises = Array
 	]);
 
 await Promise.allSettled(promises);
-
-clearTimeout(timeout);

packages/backend/src/boot/master.ts

@@ -43,6 +43,12 @@ mBuildInfo.set({
 	node_version: process.version
 }, 1);
 
+const mStartupTime = new prom.Gauge({
+	name: 'misskey_startup_time',
+	help: 'Misskey startup time',
+	labelNames: ['pid']
+});
+
 function greet() {
 	if (!envOption.quiet) {
 		//#region Misskey logo
@@ -112,6 +118,8 @@ export async function masterMain() {
 		});
 	}
 
+	mStartupTime.set({ pid: process.pid }, Date.now());
+
 	if (envOption.disableClustering) {
 		if (envOption.onlyServer) {
 			await server();

packages/backend/src/core/QueueModule.ts

@@ -31,16 +31,18 @@ export type UserWebhookDeliverQueue = Bull.Queue<UserWebhookDeliverJobData>;
 export type SystemWebhookDeliverQueue = Bull.Queue<SystemWebhookDeliverJobData>;
 
 function withMetrics<T>(queue: Bull.Queue<T>): Bull.Queue<T> {
-	setInterval(async () => {
+	if (process.env.NODE_ENV !== 'test') {
-		mActiveJobs.set({ queue: queue.name }, await queue.getActiveCount());
+		setInterval(async () => {
-		mDelayedJobs.set({ queue: queue.name }, await queue.getDelayedCount());
+			mActiveJobs.set({ queue: queue.name }, await queue.getActiveCount());
-		mWaitingJobs.set({ queue: queue.name }, await queue.getWaitingCount());
+			mDelayedJobs.set({ queue: queue.name }, await queue.getDelayedCount());
-	}, 2000);
+			mWaitingJobs.set({ queue: queue.name }, await queue.getWaitingCount());
-
+		}, 2000);
-	queue.on('waiting', () => {
-		mJobReceivedCounter.inc({ queue: queue.name });
-	});
 
+		queue.on('waiting', () => {
+			mJobReceivedCounter.inc({ queue: queue.name });
+		});
+	}
+	
 	return queue;
 }
 

packages/backend/src/postgres.ts

@@ -342,7 +342,8 @@ export function createPostgresDataSource(config: Config, isMain = false) {
 			},
 		} : false,
 		logging: log ? 'all' : ['query'],
-		logger: (isMain || log) ? new MyCustomLogger(!log) : undefined,
+		logger: process.env.NODE_ENV === 'test' ? undefined : 
+			(isMain || log) ? new MyCustomLogger(!log) : undefined,
 		maxQueryExecutionTime: 500,
 		entities: entities,
 		migrations: ['../../migration/*.js'],

packages/backend/src/server/api/MetricsService.ts

@@ -18,7 +18,7 @@ export class MetricsService {
      ) {}
 
     @bindThis
-    public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
+    public createServer(fastify: FastifyInstance) {
         if (this.config.prometheusMetrics?.enable) {
 			const token = this.config.prometheusMetrics.scrapeToken;
 			fastify.get('/metrics', async (request, reply) => {
@@ -46,7 +46,5 @@ export class MetricsService {
 				}
 			});
 		}
-
-		done();
     }
 }

packages/backend/test-server/entry.ts

@@ -5,7 +5,6 @@ import { NestFactory } from '@nestjs/core';
 import { MainModule } from '@/MainModule.js';
 import { ServerService } from '@/server/ServerService.js';
 import { loadConfig } from '@/config.js';
-import { NestLogger } from '@/NestLogger.js';
 import { INestApplicationContext } from '@nestjs/common';
 
 const config = loadConfig();
@@ -22,10 +21,8 @@ let serverService: ServerService;
 async function launch() {
 	await killTestServer();
 
-	console.log('starting application...');
-
 	app = await NestFactory.createApplicationContext(MainModule, {
-		logger: new NestLogger(),
+		logger: ["debug", "log", "error", "warn", "verbose"],
 	});
 	serverService = app.get(ServerService);
 	await serverService.launch();
@@ -84,7 +81,7 @@ async function startControllerEndpoints(port = config.port + 1000) {
 		console.log('starting application...');
 
 		app = await NestFactory.createApplicationContext(MainModule, {
-			logger: new NestLogger(),
+			logger: ["debug", "log", "error", "warn", "verbose"],
 		});
 		serverService = app.get(ServerService);
 		await serverService.launch();