wip

src/db/elasticsearch.ts

@@ -2,23 +2,24 @@ import * as elasticsearch from 'elasticsearch';
 import config from '../config';
 
 // Init ElasticSearch connection
-const client = new elasticsearch.Client({
+const client = config.elasticsearch ? new elasticsearch.Client({
 	host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
-});
+}) : null;
 
-// Send a HEAD request
-client.ping({
+if (client) {
+	// Send a HEAD request
+	client.ping({
 		// Ping usually has a 3000ms timeout
 		requestTimeout: 30000
-}, error => {
+	}, error => {
 		if (error) {
 			console.error('elasticsearch is down!');
 		} else {
 			console.log('elasticsearch is available!');
 		}
-});
+	});
 
-client.indices.create({
+	client.indices.create({
 		index: 'misskey',
 		body: {
 			settings: {
@@ -49,6 +50,7 @@ client.indices.create({
 				}
 			}
 		}
-});
+	});
+}
 
 export default client;

src/services/note/create.ts

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