Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dal): Reduce default Mongo connections #6901

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fix(dal): Reduce default Mongo connections #6901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78ab88
fix(dal): Reduce Mongo connections
SokratisVidros Nov 8, 2024
331a08a
fix(api): Always build SWC metadata before tet
SokratisVidros Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"lint": "eslint src",
"lint:fix": "pnpm lint -- --fix",
"lint:openapi": "spectral lint http://127.0.0.1:${PORT:-3000}/openapi.yaml",
"pretest": "pnpm build:metadata",
"test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test E2E_RUNNER=true mocha --require ts-node/register --exit 'src/**/*.spec.ts'",
"test:e2e": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test E2E_RUNNER=true mocha --require ts-node/register --exit --file e2e/setup.ts src/**/*.e2e.ts ",
"test:e2e:ee": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test E2E_RUNNER=true CI_EE_TEST=true CLERK_ENABLED=true mocha --grep @skip-in-ee --invert --require ts-node/register --exit --file e2e/setup.ts 'src/**/*.e2e{,-ee}.ts'",
Expand Down
8 changes: 6 additions & 2 deletions apps/api/src/config/env.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ export const envValidators = {
REDIS_TLS: json({ default: undefined }),
JWT_SECRET: str(),
SENDGRID_API_KEY: str({ default: '' }),
MONGO_URL: str(),
/** @deprecated - use `MONGO_AUTO_CREATE_INDEXES` instead */
AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_MAX_IDLE_TIME_IN_MS: num({ default: 1000 * 30 }),
MONGO_MAX_POOL_SIZE: num({ default: 50 }),
MONGO_MIN_POOL_SIZE: num({ default: 10 }),
MONGO_MAX_POOL_SIZE: num({ default: 500 }),
MONGO_URL: str(),
NOVU_API_KEY: str({ default: '' }),
STORE_ENCRYPTION_KEY: str(),
NEW_RELIC_APP_NAME: str({ default: '' }),
Expand Down
11 changes: 9 additions & 2 deletions apps/webhook/src/config/env.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CleanedEnv, cleanEnv, port, str, ValidatorSpec } from 'envalid';
import { bool, num, CleanedEnv, cleanEnv, port, str, ValidatorSpec } from 'envalid';
import { StringifyEnv } from '@novu/shared';

export function validateEnv() {
Expand All @@ -8,8 +8,15 @@ export function validateEnv() {
export type ValidatedEnv = StringifyEnv<CleanedEnv<typeof envValidators>>;

export const envValidators = {
TZ: str({ default: 'UTC' }),
/** @deprecated - use `MONGO_AUTO_CREATE_INDEXES` instead */
AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_MAX_IDLE_TIME_IN_MS: num({ default: 1000 * 30 }),
MONGO_MAX_POOL_SIZE: num({ default: 50 }),
MONGO_MIN_POOL_SIZE: num({ default: 10 }),
MONGO_URL: str(),
NODE_ENV: str({ choices: ['dev', 'test', 'production', 'ci', 'local'], default: 'local' }),
PORT: port(),
SENTRY_DSN: str({ default: undefined }),
TZ: str({ default: 'UTC' }),
} satisfies Record<string, ValidatorSpec<unknown>>;
8 changes: 6 additions & 2 deletions apps/worker/src/config/env.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@ export const envValidators = {
REDIS_CACHE_KEEP_ALIVE: str({ default: undefined }),
REDIS_CACHE_FAMILY: str({ default: undefined }),
REDIS_CACHE_KEY_PREFIX: str({ default: undefined }),
MONGO_URL: str(),
/** @deprecated - use `MONGO_AUTO_CREATE_INDEXES` instead */
AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_MAX_IDLE_TIME_IN_MS: num({ default: 1000 * 30 }),
MONGO_MAX_POOL_SIZE: num({ default: 50 }),
MONGO_MIN_POOL_SIZE: num({ default: 10 }),
MONGO_MAX_POOL_SIZE: num({ default: 500 }),
MONGO_URL: str(),
SEGMENT_TOKEN: str({ default: undefined }),
LAUNCH_DARKLY_SDK_KEY: str({ default: undefined }),
STRIPE_API_KEY: str({ default: undefined }),
Expand Down
15 changes: 11 additions & 4 deletions apps/ws/src/config/env.validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { json, num, str, port, ValidatorSpec, cleanEnv, CleanedEnv } from 'envalid';
import { json, bool, num, str, port, ValidatorSpec, cleanEnv, CleanedEnv } from 'envalid';
import { StringifyEnv } from '@novu/shared';

export function validateEnv() {
Expand All @@ -8,14 +8,21 @@ export function validateEnv() {
export type ValidatedEnv = StringifyEnv<CleanedEnv<typeof envValidators>>;

export const envValidators = {
TZ: str({ default: 'UTC' }),
JWT_SECRET: str(),
/** @deprecated - use `MONGO_AUTO_CREATE_INDEXES` instead */
AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_AUTO_CREATE_INDEXES: bool({ default: true }),
MONGO_MAX_IDLE_TIME_IN_MS: num({ default: 1000 * 30 }),
MONGO_MAX_POOL_SIZE: num({ default: 50 }),
MONGO_MIN_POOL_SIZE: num({ default: 10 }),
MONGO_URL: str(),
NODE_ENV: str({ choices: ['dev', 'test', 'production', 'ci', 'local'], default: 'local' }),
PORT: port(),
REDIS_HOST: str(),
REDIS_PORT: port(),
REDIS_TLS: json({ default: undefined }),
JWT_SECRET: str(),
SENTRY_DSN: str({ default: undefined }),
TZ: str({ default: 'UTC' }),
WORKER_DEFAULT_CONCURRENCY: num({ default: undefined }),
WORKER_DEFAULT_LOCK_DURATION: num({ default: undefined }),
SENTRY_DSN: str({ default: undefined }),
} satisfies Record<string, ValidatorSpec<unknown>>;
15 changes: 8 additions & 7 deletions libs/dal/src/dal.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import mongoose, { Connection, ConnectOptions } from 'mongoose';

export const baseConfig: ConnectOptions = {
// AUTO_CREATE_INDEXES is deprecated, use MONGO_AUTO_CREATE_INDEXES
autoIndex: process.env.AUTO_CREATE_INDEXES === 'true' || process.env.MONGO_AUTO_CREATE_INDEXES === 'true',
maxIdleTimeMS: process.env.MONGO_MAX_IDLE_TIME_IN_MS ? Number(process.env.MONGO_MAX_IDLE_TIME_IN_MS) : 1000 * 30,
maxPoolSize: process.env.MONGO_MAX_POOL_SIZE ? Number(process.env.MONGO_MAX_POOL_SIZE) : 50,
SokratisVidros marked this conversation as resolved.
Show resolved Hide resolved
minPoolSize: process.env.MONGO_MIN_POOL_SIZE ? Number(process.env.MONGO_MIN_POOL_SIZE) : 10,
rifont marked this conversation as resolved.
Show resolved Hide resolved
};

export class DalService {
connection: Connection;

async connect(url: string, config: ConnectOptions = {}) {
const baseConfig: ConnectOptions = {
maxPoolSize: +process.env.MONGO_MAX_POOL_SIZE || 500,
minPoolSize: +process.env.MONGO_MIN_POOL_SIZE || 10,
autoIndex: process.env.AUTO_CREATE_INDEXES === 'true',
maxIdleTimeMS: 1000 * 60 * 10,
};

const instance = await mongoose.connect(url, {
...baseConfig,
...config,
Expand Down
Loading