profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wip

Browse source
This commit is contained in:
syuilo 2018-07-04 20:13:05 +09:00
parent 9d49636cd1
commit 7293baa1f9
2 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/db/elasticsearch.ts
View file

@ -2,10 +2,11 @@ import * as elasticsearch from 'elasticsearch';
import config from '../config'; import config from '../config';
// Init ElasticSearch connection // Init ElasticSearch connection
const client = new elasticsearch.Client({ const client = config.elasticsearch ? new elasticsearch.Client({
host: `${config.elasticsearch.host}:${config.elasticsearch.port}` host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
}); }) : null;
if (client) {
// Send a HEAD request // Send a HEAD request
client.ping({ client.ping({
// Ping usually has a 3000ms timeout // Ping usually has a 3000ms timeout
@ -50,5 +51,6 @@ client.indices.create({
} }
} }
}); });
}
export default client; export default client;

3
src/services/note/create.ts
View file

@ -1,3 +1,4 @@
import es from '../../db/elasticsearch';
import Note, { pack, INote } from '../../models/note'; import Note, { pack, INote } from '../../models/note';
import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user'; import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
import stream, { publishLocalTimelineStream, publishGlobalTimelineStream, publishUserListStream } from '../../publishers/stream'; import stream, { publishLocalTimelineStream, publishGlobalTimelineStream, publishUserListStream } from '../../publishers/stream';
@ -431,8 +432,6 @@ export default async (user: IUser, data: {
// Register to search database // Register to search database
if (note.text && config.elasticsearch) { if (note.text && config.elasticsearch) {
const es = require('../../../db/elasticsearch');
es.index({ es.index({
index: 'misskey', index: 'misskey',
type: 'note', type: 'note',