mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Make the filter limit a restart setting with 0 for no limit
Lowering the limit at runtime would leave connections holding more filters than allowed, so read it once when the controller starts. Move the limit tests into the subscribe and replace groups. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
690b79d2b7
commit
d2163cf6a0
5 files changed
+69
-38
No files matched your search
@@ -211,10 +211,11 @@ export class ControllerConfig extends classes.Config<ControllerConfigFields> {
|
||||
},
|
||||
"controller.max_subscription_filters": {
|
||||
title: "Max Subscription Filters",
|
||||
description: "Maximum number of filters a single connection can hold for one subscribed event.",
|
||||
description: "Maximum number of filters a connection can hold for one subscribed event, 0 for no limit.",
|
||||
type: "number",
|
||||
initialValue: 10000,
|
||||
validator: validators.all(validators.integer, validators.greaterThanZero),
|
||||
restartRequired: true,
|
||||
validator: validators.all(validators.integer, validators.greaterThanEqualZero),
|
||||
},
|
||||
"controller.system_metrics_interval": {
|
||||
title: "System Metrics Interval",
|
||||
|
||||
@@ -256,11 +256,11 @@ export class SubscriptionController {
|
||||
_events = new Map<string, EventData>();
|
||||
|
||||
/**
|
||||
* @param maxFilters -
|
||||
* Optional function returning the max number of filters a subscriber can hold for one event.
|
||||
* @param _maxFilters -
|
||||
* Max number of filters a subscriber can hold for one event, 0 for no limit.
|
||||
*/
|
||||
constructor(
|
||||
private _maxFilters: () => number = () => Infinity,
|
||||
private _maxFilters = 0,
|
||||
) { }
|
||||
|
||||
/**
|
||||
@@ -338,7 +338,7 @@ export class SubscriptionController {
|
||||
}
|
||||
|
||||
private _checkFilterCount(filters: SubscriptionFilters, existing?: SubscriptionFilters) {
|
||||
if (existing?.isAll()) {
|
||||
if (this._maxFilters === 0 || existing?.isAll()) {
|
||||
return; // union into all is a noop
|
||||
}
|
||||
let count = filters.size;
|
||||
@@ -350,8 +350,8 @@ export class SubscriptionController {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (count > this._maxFilters()) {
|
||||
throw new RequestError(`Subscription exceeds the limit of ${this._maxFilters()} filters`);
|
||||
if (count > this._maxFilters) {
|
||||
throw new RequestError(`Subscription exceeds the limit of ${this._maxFilters} filters`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user