Просмотр исходного кода

Rename variable (matrix_hookshot_feeds_interval -> matrix_hookshot_feeds_pollIntervalSeconds)

This is more consistent with how we name variables. It's also less
confusing, especially given that we have `matrix_hookshot_feeds_pollTimeoutSeconds` as well.
pull/2223/head
Slavi Pantaleev 3 лет назад
Родитель
Сommit
e1274a6e56
3 измененных файлов: 12 добавлений и 4 удалений
  1. +1
    -2
      roles/matrix-bridge-hookshot/defaults/main.yml
  2. +9
    -0
      roles/matrix-bridge-hookshot/tasks/validate_config.yml
  3. +2
    -2
      roles/matrix-bridge-hookshot/templates/config.yml.j2

+ 1
- 2
roles/matrix-bridge-hookshot/defaults/main.yml Просмотреть файл

@@ -129,8 +129,7 @@ matrix_hookshot_generic_user_id_prefix: '_webhooks_'


matrix_hookshot_feeds_enabled: true
# polling interval in seconds
matrix_hookshot_feeds_interval: 600
matrix_hookshot_feeds_pollIntervalSeconds: 600
matrix_hookshot_feeds_pollTimeoutSeconds: 10




+ 9
- 0
roles/matrix-bridge-hookshot/tasks/validate_config.yml Просмотреть файл

@@ -58,6 +58,15 @@
with_items:
- "matrix_hookshot_provisioning_secret"

- name: (Deprecation) Catch and report renamed Hookshot variables
ansible.builtin.fail:
msg: >-
Your configuration contains a variable, which now has a different name.
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
when: "item.old in vars"
with_items:
- {'old': 'matrix_hookshot_feeds_interval', 'new': 'matrix_hookshot_feeds_pollIntervalSeconds'}

- name: (Deprecation) Catch and report old metrics usage
ansible.builtin.fail:
msg: >-


+ 2
- 2
roles/matrix-bridge-hookshot/templates/config.yml.j2 Просмотреть файл

@@ -82,8 +82,8 @@ generic:
feeds:
# (Optional) Configure this to enable RSS/Atom feed support
#
enabled: {{ matrix_hookshot_feeds_enabled }}
pollIntervalSeconds: {{ matrix_hookshot_feeds_interval }}
enabled: {{ matrix_hookshot_feeds_enabled | to_json }}
pollIntervalSeconds: {{ matrix_hookshot_feeds_pollIntervalSeconds | to_json }}
pollTimeoutSeconds: {{ matrix_hookshot_feeds_pollTimeoutSeconds | to_json }}
{% endif %}
{% if matrix_hookshot_provisioning_enabled %}


Загрузка…
Отмена
Сохранить