diff options
| author | 和風ドレッシング <37681609+CookieRamen@users.noreply.github.com> | 2019-08-09 13:04:35 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-08-09 13:04:35 +0900 |
| commit | 1c273a0a756a71984c51966dccc7c0f48b1737b3 (patch) | |
| tree | a873f45bc55b9380ae500f918e675d7c708a8dfa | |
| parent | PackedUserがサイレンスや凍結の情報を持つように (#5255) (diff) | |
| download | misskey-1c273a0a756a71984c51966dccc7c0f48b1737b3.tar.gz misskey-1c273a0a756a71984c51966dccc7c0f48b1737b3.tar.bz2 misskey-1c273a0a756a71984c51966dccc7c0f48b1737b3.zip | |
Elasticsearchのインデックス名をconfigで変更できるように (#5257)
| -rw-r--r-- | src/config/types.ts | 1 | ||||
| -rw-r--r-- | src/db/elasticsearch.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/notes/search.ts | 3 | ||||
| -rw-r--r-- | src/services/note/create.ts | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/config/types.ts b/src/config/types.ts index be3575d282..9ecf495c42 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -28,6 +28,7 @@ export type Source = { host: string; port: number; pass: string; + index?: string; }; autoAdmin?: boolean; diff --git a/src/db/elasticsearch.ts b/src/db/elasticsearch.ts index 02c9e88d9c..b34ebe605c 100644 --- a/src/db/elasticsearch.ts +++ b/src/db/elasticsearch.ts @@ -38,11 +38,11 @@ const client = config.elasticsearch ? new elasticsearch.Client({ if (client) { client.indices.exists({ - index: 'misskey_note' + index: config.elasticsearch.index || 'misskey_note', }).then(exist => { if (!exist.body) { client.indices.create({ - index: 'misskey_note', + index: config.elasticsearch.index || 'misskey_note', body: index }); } diff --git a/src/server/api/endpoints/notes/search.ts b/src/server/api/endpoints/notes/search.ts index d3fb33c420..5557b469e4 100644 --- a/src/server/api/endpoints/notes/search.ts +++ b/src/server/api/endpoints/notes/search.ts @@ -5,6 +5,7 @@ import { ApiError } from '../../error'; import { Notes } from '../../../../models'; import { In } from 'typeorm'; import { ID } from '../../../../misc/cafy-id'; +import config from '../../../../config'; export const meta = { desc: { @@ -87,7 +88,7 @@ export default define(meta, async (ps, me) => { : []; const result = await es.search({ - index: 'misskey_note', + index: config.elasticsearch.index || 'misskey_note', body: { size: ps.limit!, from: ps.offset, diff --git a/src/services/note/create.ts b/src/services/note/create.ts index c38eb1898e..48d8670228 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -434,7 +434,7 @@ function index(note: Note) { if (note.text == null || config.elasticsearch == null) return; es!.index({ - index: 'misskey_note', + index: config.elasticsearch.index || 'misskey_note', id: note.id.toString(), body: { text: note.text.toLowerCase(), |