mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-27 23:53:08 +02:00
Elasticsearchのインデックス名をconfigで変更できるように (#5257)
This commit is contained in:
parent
fa2c7658a0
commit
1c273a0a75
4 changed files with 6 additions and 4 deletions
|
@ -28,6 +28,7 @@ export type Source = {
|
|||
host: string;
|
||||
port: number;
|
||||
pass: string;
|
||||
index?: string;
|
||||
};
|
||||
|
||||
autoAdmin?: boolean;
|
||||
|
|
|
@ -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
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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(),
|
||||
|
|
Loading…
Reference in a new issue