Skip to content

Fix: Improve quota notification and blocking logic #489

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

Merged
talyguryn merged 2 commits into from
Dec 8, 2025
Merged

Fix: Improve quota notification and blocking logic #489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6c1aa
Improve quota notification and blocking logic
talyguryn Dec 8, 2025
3f71c01
Suppress magic number lint warning in logger
talyguryn Dec 8, 2025
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
32 changes: 22 additions & 10 deletions workers/limiter/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,19 +269,31 @@ export default class LimiterWorker extends Worker {
const isAlreadyBlocked = workspace.isBlocked;

/**
* Send notification if workspace will be blocked cause events limit
* Check quota and send notifications if needed
* - if should be blocked by quota and is not blocked yet -> block and notify
* - if is about to reach limit -> notify
*/
if (!isAlreadyBlocked && shouldBeBlockedByQuota) {
if (shouldBeBlockedByQuota) {
if (!isAlreadyBlocked) {
this.logger.info(`Workspace ${workspace._id} will be blocked by quota: ${workspaceEventsCount} of ${workspace.tariffPlan.eventsLimit} events used`);

/**
* Add task for Sender worker
*/
await this.addTask(WorkerNames.EMAIL, {
type: 'block-workspace',
payload: {
workspaceId: workspace._id,
},
});
}
} else if (quotaNotification) {
/**
* Add task for Sender worker
* Notify that workspace is about to reach events limit
*/
await this.addTask(WorkerNames.EMAIL, {
type: 'block-workspace',
payload: {
workspaceId: workspace._id,
},
});
} else if (quotaNotification) {
// eslint-disable-next-line @typescript-eslint/no-magic-numbers
this.logger.info(`Workspace ${workspace._id} is about to reach events limit: ${Math.floor(usedQuota * 100)}% used`);

/**
* Add task for Sender worker
*/
Expand Down
Loading