public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pro

Browse source 
* master:
  Handling getMore mongo log.
  Naming pg_basebackup
This commit is contained in:
Samuel Clay 2022-05-11 13:12:06 -04:00
commit 9bb9700cc5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible/roles/backups/tasks/main.yml
View file

@ -94,7 +94,7 @@
- name: pg_basebackup
become: yes
command:
docker run --rm --network=host -e POSTGRES_PASSWORD=newsblur -v /srv/newsblur/docker/volumes/postgres/data:/var/lib/postgresql/data postgres:13 pg_basebackup -h db-postgres-staging.service.nyc1.consul -p 5432 -U newsblur -D /var/lib/postgresql/data -Fp -R -Xs -P -c fast
docker run --rm --name=pg_basebackup--network=host -e POSTGRES_PASSWORD=newsblur -v /srv/newsblur/docker/volumes/postgres/data:/var/lib/postgresql/data postgres:13 pg_basebackup -h db-postgres.service.nyc1.consul -p 5432 -U newsblur -D /var/lib/postgresql/data -Fp -R -Xs -P -c fast
# when: (inventory_hostname | regex_replace('[0-9]+', '')) in ['db-postgres-secondary']
tags:
- never

2
utils/mongo_command_monitor.py
View file

@ -45,7 +45,7 @@ class MongoCommandLogger(monitoring.CommandListener):
query = f"{[dict(dict(i)['q']) for i in command_insert]}"
elif command_update:
query = f"{[dict(dict(i)['q']) for i in command_update]}"
elif command_get_more:
elif command_get_more and isinstance(command_get_more, dict):
query = f"{command_get_more['collection']}"
query_size = len(str(query))
if query_size > 500: