diff --git a/package.json b/package.json index 333300e35..123f308a6 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "build-gulp": "gulp build", "export": "pnpm build-ts && node ./built/migration/migrateAyuskeyNext.js", "worker": "node ./built/migration/worker.js", + "bull-board": "node ./built/migration/bullDashboard.js", "next": "node ./built/migration/migrateAyuskeyNext.js", "webpack": "webpack", "dev": "echo \"**コミットをしたら再起動が必要!!/Need to restart after a commit!!**\" && run-p watch-webpack gulpstart", diff --git a/src/migration/migrateAyuskeyNext.ts b/src/migration/migrateAyuskeyNext.ts index 274d5db7e..492523169 100644 --- a/src/migration/migrateAyuskeyNext.ts +++ b/src/migration/migrateAyuskeyNext.ts @@ -6,11 +6,8 @@ import { AyuskeyNextEntities } from "@/v13/models"; import config from "@/config"; import { migrateMeta } from "./meta"; -import { spawn } from "child_process"; import { migrateUsedUsernames } from "./UsedUsername"; - - import { migrateUsers } from "./user"; import { migrateRelaies } from "./Relay"; import { migrateApps } from "./App"; @@ -23,8 +20,7 @@ import { migrateUserListJoinings } from "./UserListJoining"; import { migrateAnnouncements } from "./Announcement"; import { migrateInstances } from "./instance"; import { migrateHashtags } from "./hashtag"; - - +import { logger } from "./common"; async function main(): Promise { const originalDb = await initDb(); @@ -39,15 +35,6 @@ async function main(): Promise { entities: AyuskeyNextEntities, }); - - const bullDashboardProc = spawn("node", [ - "./built/migration/bullDashboard.js", - ]); - - bullDashboardProc.stdout.on("message", (data) => { - console.log(data); - }); - await migrateAnnouncements(); await migrateRelaies(originalDb, nextDb); await migrateUsedUsernames(originalDb, nextDb); @@ -64,10 +51,8 @@ async function main(): Promise { await migrateSwSubscriptions(); await migrateUsers(originalDb, nextDb); - process.on("SIGINT", () => { - bullDashboardProc.kill(); - process.exit(0); - }); + logger.succ("ジョブの登録が完了しました") + } main().catch((e) => { diff --git a/src/migration/userAfterHook.ts b/src/migration/userAfterHook.ts index e6c206bb2..334300605 100644 --- a/src/migration/userAfterHook.ts +++ b/src/migration/userAfterHook.ts @@ -12,6 +12,7 @@ import { getConnection } from "typeorm"; import { migratePasswordResetRequests } from "./PassworResetRequest"; import { migrateAuthSessions } from "./AuthSession"; import { userAfterHookQueue } from "./jobqueue"; +import { logger } from "./common"; export async function userAfterHook(user: User) { const originalDb = getConnection(); @@ -33,5 +34,5 @@ export async function userAfterHook(user: User) { if (await userAfterHookQueue.getCompletedCount() > 1000) { await userAfterHookQueue.clean(0, "completed"); } - console.info(`UserAfterHook: ${user.id} の処理が完了しました`); + logger.succ(`UserAfterHook: ${user.id} の処理が完了しました`); }