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

Cleaning up monitors, switching to cron file, adding hostname.

Browse source
This commit is contained in:
Samuel Clay 2021-06-24 11:50:38 -04:00
parent f56acc1360
commit ae95b25910
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ansible/roles/celery_task/tasks/main.yml
View file

@ -105,10 +105,12 @@
become: yes
cron:
name: feeds_fetched_sanity_checker
special_time: hourly
user: root
cron_file: /etc/cron.hourly/feeds_fetched_sanity_checker
job: docker pull newsblur/newsblur_python3:latest;
docker run --rm -it
-v /srv/newsblur/:/srv/newsblur
-h `cat /etc/hostname`
--network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_task_fetches.py
when: "'task-work' in inventory_hostname"
tags:
@ -118,10 +120,12 @@
become: yes
cron:
name: newsletter_sanity_checker
special_time: hourly
user: root
cron_file: /etc/cron.hourly/newsletter_sanity_checker
job: docker pull newsblur/newsblur_python3:latest;
docker run --rm -it
-v /srv/newsblur/:/srv/newsblur
-h `cat /etc/hostname`
--network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_newsletter_delivery.py
when: "'task-work' in inventory_hostname"
tags:
@ -131,11 +135,13 @@
become: yes
cron:
name: work_queue_sanity_checker
special_time: hourly
user: root
cron_file: /etc/cron.hourly/work_queue_sanity_checker
job: docker pull newsblur/newsblur_python3:latest;
docker run --rm
-v /srv/newsblur/:/srv/newsblur
--network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_work_queue.py
-h `cat /etc/hostname`
--network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_work_queue.py
when: "'task-work' in inventory_hostname"
tags:
- sanity-checker

2
utils/monitor_newsletter_delivery.py
View file

@ -27,7 +27,7 @@ def main():
auth=("api", settings.MAILGUN_ACCESS_KEY),
data={"from": "NewsBlur Newsletter Monitor: %s <admin@%s.newsblur.com>" % (hostname, hostname),
"to": [admin_email],
"subject": "%s newsletters bounced: %s > %s > %s" % (hostname, accepted, delivered, bounced),
"subject": "%s newsletters bounced: %s/%s accepted/delivered -> %s bounced" % (hostname, accepted, delivered, bounced),
"text": "Newsletters are not being delivered! %s delivered, %s bounced" % (delivered, bounced)})
print(" ---> %s newsletters bounced: %s > %s > %s" % (hostname, accepted, delivered, bounced))
else: