Skip to content

Commit 9fcea19

Browse files
qa
1 parent 32edc00 commit 9fcea19

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

alembic/versions/a4e8be715296_add_deleted_as_new_status.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
Create Date: 2024-07-25 13:13:11.955119
66
77
"""
8-
import sqlalchemy as sa
98

10-
from sqlalchemy.dialects.postgresql import ENUM
9+
import sqlalchemy as sa
1110

1211
from alembic import op
1312

cads_broker/dispatcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ def manage_dismissed_request(self, request, session):
342342
)
343343
request.status = "deleted"
344344
elif previous_status == "accepted":
345-
print('-----------', dismission_metadata.get("reason", ""))
346345
self.queue.pop(request.request_uid, None)
347346
self.qos.notify_dismission_of_request(
348347
request, session, scheduler=self.internal_scheduler

cads_broker/qos/QoS.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ def _properties(self, request, session):
143143
database.set_dismissed_request(
144144
request_uid=request.request_uid,
145145
session=session,
146-
message=rule.info.evaluate(
147-
Context(request, self.environment)
148-
),
146+
message=rule.info.evaluate(Context(request, self.environment)),
149147
reason="PermissionError",
150148
)
151149
break
@@ -253,20 +251,24 @@ def user_limit(self, request):
253251

254252
limits = self.per_user_limits.get(user, [])
255253
applied_limits = []
256-
for limit in limits:
257-
if limit.match(request):
258-
applied_limits.append(limit)
254+
for user_limit in limits:
255+
if user_limit.match(request):
256+
applied_limits.append(user_limit)
259257

260-
for limit in self.rules.user_limits:
261-
if limit.match(request):
258+
for user_limit in self.rules.user_limits:
259+
if user_limit.match(request):
262260
"""
263261
We clone the rule because we need one instance per different
264262
user otherwise all users will share that limit
265263
"""
266-
if limit.get_uid(request) not in [l.get_uid(request) for l in limits]:
267-
limit = limit.clone()
268-
applied_limits.append(limit)
269-
self.per_user_limits[user] = self.per_user_limits.get(user, []) + [limit]
264+
if user_limit.get_uid(request) not in [
265+
limit.get_uid(request) for limit in limits
266+
]:
267+
user_limit = user_limit.clone()
268+
applied_limits.append(user_limit)
269+
self.per_user_limits[user] = self.per_user_limits.get(user, []) + [
270+
user_limit
271+
]
270272
return applied_limits
271273

272274
@locked

0 commit comments

Comments
 (0)