Merge remote-tracking branch 'upstream/develop' into develop

Author: 1673beta

CHANGELOG_CHERRYPICK.md

@@ -66,6 +66,8 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2025xx](CHANGE
 
 ### Server
 - Fix: `노트 게시 예약`을 사용해 노트를 게시할 때 `연합에 보내지 않음` 설정이 반영되지 않을 수 있음 (kokonect-link/cherrypick#601)
+- Revert: Graceful Shutdown (MisskeyIO/misskey#156)
+- Revert: Enhance: 종료 시 DB 연결이 끊어지면 확실하게 종료 (MisskeyIO/misskey#159)
 
 ---
 

Dockerfile

@@ -101,4 +101,4 @@ ENV MALLOC_CONF=background_thread:true,metadata_thp:auto,dirty_decay_ms:30000,mu
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/cherrypick/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["pnpm", "run", "migrateandstart:docker"]
+CMD ["pnpm", "run", "migrateandstart"]

locales/ko-KR.yml

@@ -1091,7 +1091,7 @@ overridedDeviceKind: "장치 유형"
 smartphone: "스마트폰"
 tablet: "태블릿"
 auto: "자동"
-themeColor: "테마 컬러"
+themeColor: "테마 색상"
 size: "크기"
 numberOfColumn: "한 줄에 보일 리액션의 수"
 searchByGoogle: "검색"

package.json

@@ -25,14 +25,12 @@
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"build-cherrypick-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!cherrypick-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/cherrypick-js/generator/api.json && pnpm --filter cherrypick-js update-autogen-code && pnpm --filter cherrypick-js build && pnpm --filter cherrypick-js api",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
-		"start:docker": "pnpm check:connect && cd packages/backend && exec node ./built/boot/entry.js",
 		"start:test": "ncp ./.github/cherrypick/test.yml ./.config/test.yml && cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
 		"migrate": "cd packages/backend && pnpm migrate",
 		"revert": "cd packages/backend && pnpm revert",
 		"check:connect": "cd packages/backend && pnpm check:connect",
 		"migrateandstart": "pnpm migrate && pnpm start",
-		"migrateandstart:docker": "pnpm migrate && exec pnpm start:docker",
 		"watch": "pnpm dev",
 		"dev": "node scripts/dev.mjs",
 		"lint": "pnpm -r lint",

packages/backend/src/GlobalModule.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import process from 'node:process';
 import { Global, Inject, Module } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { DataSource } from 'typeorm';
@@ -242,9 +241,5 @@ export class GlobalModule implements OnApplicationShutdown {
 
 	async onApplicationShutdown(signal: string): Promise<void> {
 		await this.dispose();
-		process.emitWarning('CherryPick is shutting down', {
-			code: 'CHERRYPICK_SHUTDOWN',
-			detail: `Application received ${signal} signal`,
-		});
 	}
 }

packages/backend/src/boot/entry.ts

@@ -9,7 +9,6 @@
 
 import cluster from 'node:cluster';
 import { EventEmitter } from 'node:events';
-import process from 'node:process';
 import chalk from 'chalk';
 import Xev from 'xev';
 import Logger from '@/logger.js';
@@ -31,38 +30,23 @@ const ev = new Xev();
 
 //#region Events
 
-let isShuttingDown = false;
-
-if (cluster.isPrimary && !envOption.disableClustering) {
-	// Listen new workers
-	cluster.on('fork', worker => {
-		clusterLogger.debug(`Process forked: [${worker.id}]`);
-	});
-
-	// Listen online workers
-	cluster.on('online', worker => {
-		clusterLogger.debug(`Process is now online: [${worker.id}]`);
-	});
-
-	// Listen for dying workers
-	cluster.on('exit', (worker, code, signal) => {
-		// Replace the dead worker,
-		// we're not sentimental
-		clusterLogger.error(chalk.red(`[${worker.id}] died (${signal || code})`));
-		if (!isShuttingDown) cluster.fork();
-		else clusterLogger.info(chalk.yellow('Worker respawn disabled because of shutdown'));
-	});
-
-	process.on('SIGINT', () => {
-		logger.warn(chalk.yellow('Process received SIGINT'));
-		isShuttingDown = true;
-	});
-
-	process.on('SIGTERM', () => {
-		logger.warn(chalk.yellow('Process received SIGTERM'));
-		isShuttingDown = true;
-	});
-}
+// Listen new workers
+cluster.on('fork', worker => {
+	clusterLogger.debug(`Process forked: [${worker.id}]`);
+});
+
+// Listen online workers
+cluster.on('online', worker => {
+	clusterLogger.debug(`Process is now online: [${worker.id}]`);
+});
+
+// Listen for dying workers
+cluster.on('exit', worker => {
+	// Replace the dead worker,
+	// we're not sentimental
+	clusterLogger.error(chalk.red(`[${worker.id}] died :(`));
+	cluster.fork();
+});
 
 // Display detail of unhandled promise rejection
 if (!envOption.quiet) {
@@ -79,14 +63,7 @@ process.on('uncaughtException', err => {
 
 // Dying away...
 process.on('exit', code => {
-	logger.warn(chalk.yellow(`The process is going to exit with code ${code}`));
-});
-
-process.on('warning', warning => {
-	if ((warning as never)['code'] !== 'CHERRYPICK_SHUTDOWN') return;
-	logger.warn(chalk.yellow(`${warning.message}: ${(warning as never)['detail']}`));
-	for (const id in cluster.workers) cluster.workers[id]?.process.kill('SIGTERM');
-	process.exit();
+	logger.info(`The process is going to exit with code ${code}`);
 });
 
 //#endregion

packages/backend/src/server/ServerService.ts

@@ -306,7 +306,7 @@ export class ServerService implements OnApplicationShutdown {
 
 	@bindThis
 	public async dispose(): Promise<void> {
-		this.streamingApiServerService.detach();
+		await this.streamingApiServerService.detach();
 		await this.#fastify.close();
 	}
 

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

@@ -170,12 +170,13 @@ export class StreamingApiServerService {
 	}
 
 	@bindThis
-	public detach(): void {
+	public detach(): Promise<void> {
 		if (this.#cleanConnectionsIntervalId) {
 			clearInterval(this.#cleanConnectionsIntervalId);
 			this.#cleanConnectionsIntervalId = null;
 		}
-		this.#wss.close();
-		this.#wss.clients.forEach(client => client.terminate());
+		return new Promise((resolve) => {
+			this.#wss.close(() => resolve());
+		});
 	}
 }