natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Only connect to Meili with valid config' (#10222) from PrivateGER/calckey:fix/meilisearch-fallback-code into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10222
This commit is contained in:
Kainoa Kanter 2023-05-29 16:21:04 +00:00
parent 69852b8a05 e52b1330d3
commit 48d7c9f881
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/db/meilisearch.ts
View File

@ -9,19 +9,20 @@ import { Followings, Users } from "@/models/index.js";
const logger = dbLogger.createSubLogger("meilisearch", "gray", false); const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
logger.info("Connecting to MeiliSearch");
const hasConfig = const hasConfig =
config.meilisearch && config.meilisearch &&
(config.meilisearch.host || (config.meilisearch.host ||
config.meilisearch.port || config.meilisearch.port ||
config.meilisearch.apiKey); config.meilisearch.apiKey);
if (hasConfig) {
const host = hasConfig ? config.meilisearch.host ?? "localhost" : ""; const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
const port = hasConfig ? config.meilisearch.port ?? 7700 : 0; const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
const auth = hasConfig ? config.meilisearch.apiKey ?? "" : ""; const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
const ssl = hasConfig ? config.meilisearch.ssl ?? false : false; const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
logger.info("Connecting to MeiliSearch");
const client: MeiliSearch = new MeiliSearch({ const client: MeiliSearch = new MeiliSearch({
host: `${ssl ? "https" : "http"}://${host}:${port}`, host: `${ssl ? "https" : "http"}://${host}:${port}`,
apiKey: auth, apiKey: auth,
@ -58,6 +59,7 @@ posts
); );
logger.info("Connected to MeiliSearch"); logger.info("Connected to MeiliSearch");
}
export type MeilisearchNote = { export type MeilisearchNote = {
id: string; id: string;