File tree Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Expand file tree Collapse file tree 2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -1034,7 +1034,7 @@ class CeleryConfig: # pylint: disable=too-few-public-methods
1034
1034
# "prune_query": {
1035
1035
# "task": "prune_query",
1036
1036
# "schedule": crontab(minute=0, hour=0, day_of_month=1),
1037
- # "options ": {"retention_period_days": 180},
1037
+ # "kwargs ": {"retention_period_days": 180},
1038
1038
# },
1039
1039
}
1040
1040
Original file line number Diff line number Diff line change 16
16
# under the License.
17
17
import logging
18
18
from datetime import datetime , timezone
19
+ from typing import Optional
19
20
20
21
from celery import Celery
21
22
from celery .exceptions import SoftTimeLimitExceeded
@@ -123,13 +124,21 @@ def prune_log() -> None:
123
124
124
125
125
126
@celery_app .task (name = "prune_query" )
126
- def prune_query () -> None :
127
+ def prune_query (retention_period_days : Optional [ int ] = None ) -> None :
127
128
stats_logger : BaseStatsLogger = app .config ["STATS_LOGGER" ]
128
129
stats_logger .incr ("prune_query" )
129
130
131
+ # TODO: Deprecated: Remove support for passing retention period via options in 6.0
132
+ if retention_period_days is None :
133
+ retention_period_days = prune_query .request .properties .get (
134
+ "retention_period_days"
135
+ )
136
+ logger .warning (
137
+ "Your `prune_query` beat schedule uses `options` to pass the retention "
138
+ "period, please use `kwargs` instead."
139
+ )
140
+
130
141
try :
131
- QueryPruneCommand (
132
- prune_query .request .properties .get ("retention_period_days" )
133
- ).run ()
142
+ QueryPruneCommand (retention_period_days ).run ()
134
143
except CommandException as ex :
135
144
logger .exception ("An error occurred while pruning queries: %s" , ex )
You can’t perform that action at this time.
0 commit comments