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

Revert 96bc17aa10

Browse source
This commit is contained in:
syuilo 2019-02-07 21:02:33 +09:00
parent 27768081e2
commit 5448c22031
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
19 changed files with 125 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/db/elasticsearch.ts
View file

@ -42,10 +42,9 @@ const index = {
};
// Init ElasticSearch connection
const client = config.elasticsearch.map(({ host, port }) => {
return new elasticsearch.Client({ host: `${host}:${port}` });
}).getOrElse(null);
const client = config.elasticsearch ? new elasticsearch.Client({
host: `${config.elasticsearch.host}:${config.elasticsearch.port}`
}) : null;
if (client) {
// Send a HEAD request

4
src/db/mongodb.ts
View file

@ -1,7 +1,7 @@
import config from '../config';
const u = config.mongodb.user.map(x => encodeURIComponent(x)).getOrElse(null);
const p = config.mongodb.pass.map(x => encodeURIComponent(x)).getOrElse(null);
const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
const uri = `mongodb://${u && p ? `${u}:${p}@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;

12
src/db/redis.ts
View file

@ -1,8 +1,10 @@
import * as redis from 'redis';
import config from '../config';
export default config.redis.map(({ host, port, pass }) => {
return redis.createClient(port, host, {
auth_pass: pass.getOrElse(null)
});
}).getOrElse(null);
export default config.redis ? redis.createClient(
config.redis.port,
config.redis.host,
{
auth_pass: config.redis.pass
}
) : null;