Skip to content

Commit

Permalink
🔥 [open-zaak/open-zaak#1203] Remove old envvars
Browse files Browse the repository at this point in the history
remove old notification retry envvars, and update the docs accordingly
  • Loading branch information
stevenbal committed Jun 28, 2022
1 parent c6e0b2e commit bde7f23
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 26 deletions.
10 changes: 1 addition & 9 deletions docs/delivery_guarantees.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,7 @@ On delivery failure, Open Notificaties will automatically retry delivery, with
exponential backoff. E.g. the first retry will be done after one second, the next after
two seconds and the third after 4 seconds.

The parameters for this can be :ref:`configured <installation_config_index>`:

* ``NOTIFICATION_DELIVERY_MAX_RETRIES``: the maximum number of automatic retries. After
this amount of retries, Open Notificaties stops trying to deliver the message.
* ``NOTIFICATION_DELIVERY_RETRY_BACKOFF``: if specified, a factor applied to the
exponential backoff. This allows you to tune how quickly automatic retries are
performed.
* ``NOTIFICATION_DELIVERY_RETRY_BACKOFF_MAX``: an upper limit to the exponential
backoff time.
The parameters for this are described and can be configured in the admin interface, under ``Configuration > Notification component configuration``.

On top of that, via the admin interface you can manually select notifications to retry
delivery for.
Expand Down
10 changes: 0 additions & 10 deletions docs/installation/configuration/env_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,6 @@ on Docker, since `localhost` is contained within the container:

* `CELERY_RESULT_BACKEND`: the backend where the results of tasks will be stored (default: `redis://localhost:6379/1`)

* `NOTIFICATION_DELIVERY_MAX_RETRIES`: the maximum number of retries Celery will do if sending a notification failed.

* `NOTIFICATION_DELIVERY_RETRY_BACKOFF`: a boolean or a number. If this option is set to
`True`, autoretries will be delayed following the rules of exponential backoff. If
this option is set to a number, it is used as a delay factor.

* `NOTIFICATION_DELIVERY_RETRY_BACKOFF_MAX`: an integer, specifying number of seconds.
If ``retry_backoff`` is enabled, this option will set a maximum delay in seconds
between task autoretries. By default, this option is set to 48 seconds.

### Cross-Origin-Resource-Sharing

The following parameters control the CORS policy.
Expand Down
7 changes: 0 additions & 7 deletions src/nrc/conf/includes/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,13 +469,6 @@
CELERY_BROKER_URL = config("CELERY_BROKER_URL", "amqp://127.0.0.1:5672//")
CELERY_RESULT_BACKEND = config("CELERY_RESULT_BACKEND", "redis://localhost:6379/1")

# Retry settings for delivering notifications to subscriptions
NOTIFICATION_DELIVERY_MAX_RETRIES = config("NOTIFICATION_DELIVERY_MAX_RETRIES", 5)
NOTIFICATION_DELIVERY_RETRY_BACKOFF = config("NOTIFICATION_DELIVERY_RETRY_BACKOFF", 3)
NOTIFICATION_DELIVERY_RETRY_BACKOFF_MAX = config(
"NOTIFICATION_DELIVERY_RETRY_BACKOFF_MAX", 48
)

#
# DJANGO-ADMIN-INDEX
#
Expand Down

0 comments on commit bde7f23

Please sign in to comment.