diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2025-01-14 21:01:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 12:01:01 +0000 |
| commit | 71cecdbcf2d46d00ff58634eafec9227f4264b08 (patch) | |
| tree | 8ebf136c9bf61a2d1f36996f596db75c9c0afc4e /packages/backend/src/GlobalModule.ts | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-71cecdbcf2d46d00ff58634eafec9227f4264b08.tar.gz sharkey-71cecdbcf2d46d00ff58634eafec9227f4264b08.tar.bz2 sharkey-71cecdbcf2d46d00ff58634eafec9227f4264b08.zip | |
feat(backend): pgroongaに対応（configの構成変更あり） (#14978)
* feat(backend): pgroongaに対応（configの構成変更あり）
* fix CHANGELOG.md
* fix CHANGELOG.md
* add using provider logging
* fix CHANGELOG.md
* Update CHANGELOG.md
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/GlobalModule.ts')
| -rw-r--r-- | packages/backend/src/GlobalModule.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/backend/src/GlobalModule.ts b/packages/backend/src/GlobalModule.ts index 6ae8ccfbb3..ace7f7841c 100644 --- a/packages/backend/src/GlobalModule.ts +++ b/packages/backend/src/GlobalModule.ts @@ -7,14 +7,14 @@ import { Global, Inject, Module } from '@nestjs/common'; import * as Redis from 'ioredis'; import { DataSource } from 'typeorm'; import { MeiliSearch } from 'meilisearch'; +import { MiMeta } from '@/models/Meta.js'; import { DI } from './di-symbols.js'; import { Config, loadConfig } from './config.js'; import { createPostgresDataSource } from './postgres.js'; import { RepositoryModule } from './models/RepositoryModule.js'; import { allSettled } from './misc/promise-tracker.js'; -import type { Provider, OnApplicationShutdown } from '@nestjs/common'; -import { MiMeta } from '@/models/Meta.js'; import { GlobalEvents } from './core/GlobalEventService.js'; +import type { Provider, OnApplicationShutdown } from '@nestjs/common'; const $config: Provider = { provide: DI.config, @@ -33,7 +33,11 @@ const $db: Provider = { const $meilisearch: Provider = { provide: DI.meilisearch, useFactory: (config: Config) => { - if (config.meilisearch) { + if (config.fulltextSearch?.provider === 'meilisearch') { + if (!config.meilisearch) { + throw new Error('MeiliSearch is enabled but no configuration is provided'); + } + return new MeiliSearch({ host: `${config.meilisearch.ssl ? 'https' : 'http'}://${config.meilisearch.host}:${config.meilisearch.port}`, apiKey: config.meilisearch.apiKey, |