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

Changing whatsapp logging variable to match others

pull/1920/head
ThellraAK 3 лет назад
Родитель
Сommit
1f5b2c8535
3 измененных файлов: 15 добавлений и 4 удалений
  1. +4
    -3
      roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml
  2. +10
    -0
      roles/matrix-bridge-mautrix-whatsapp/tasks/validate_config.yml
  3. +1
    -1
      roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2

+ 4
- 3
roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml Просмотреть файл

@@ -39,6 +39,10 @@ matrix_mautrix_whatsapp_homeserver_token: ''


matrix_mautrix_whatsapp_appservice_bot_username: whatsappbot matrix_mautrix_whatsapp_appservice_bot_username: whatsappbot


# Minimum severity of journal log messages.
# Options: debug, info, warn, error, fatal
matrix_mautrix_whatsapp_logging_level: 'warn'

# Whether or not created rooms should have federation enabled. # Whether or not created rooms should have federation enabled.
# If false, created portal rooms will never be federated. # If false, created portal rooms will never be federated.
matrix_mautrix_whatsapp_federate_rooms: true matrix_mautrix_whatsapp_federate_rooms: true
@@ -131,6 +135,3 @@ matrix_mautrix_whatsapp_bridge_encryption_allow: false
matrix_mautrix_whatsapp_bridge_encryption_default: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}" matrix_mautrix_whatsapp_bridge_encryption_default: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}"
matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}" matrix_mautrix_whatsapp_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_whatsapp_bridge_encryption_allow }}"


# Minimum severity of journal log messages.
# Options: debug, info, warn, error, fatal
matrix_mautrix_whatsapp_log_level: 'warn'

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

@@ -8,3 +8,13 @@
with_items: with_items:
- "matrix_mautrix_whatsapp_appservice_token" - "matrix_mautrix_whatsapp_appservice_token"
- "matrix_mautrix_whatsapp_homeserver_token" - "matrix_mautrix_whatsapp_homeserver_token"


- name: (Deprecation) Catch and report renamed settings
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_mautrix_whatsapp_log_level', 'new': '<superseded by matrix_mautrix_whatsapp_logging_level>'}

+ 1
- 1
roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 Просмотреть файл

@@ -224,4 +224,4 @@ logging:
timestamp_format: "Jan _2, 2006 15:04:05" timestamp_format: "Jan _2, 2006 15:04:05"
# Minimum severity for log messages. # Minimum severity for log messages.
# Options: debug, info, warn, error, fatal # Options: debug, info, warn, error, fatal
print_level: {{ matrix_mautrix_whatsapp_log_level }}
print_level: {{ matrix_mautrix_whatsapp_logging_level }}

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