diff --git a/.gitignore b/.gitignore index 47e542f9b..c3ddd612c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ logs/*.log logs/*.log.* logs/*.pid +logs/celerybeat-schedule.db *.pyc __pycache__/ static/* @@ -87,4 +88,4 @@ clients/android/NewsBlur/settings.gradle **/node_modules *.tfstate* .terraform* -grafana.ini \ No newline at end of file +grafana.ini diff --git a/ansible/deploy.yml b/ansible/deploy.yml index fea9efba7..2a4d83ea0 100644 --- a/ansible/deploy.yml +++ b/ansible/deploy.yml @@ -15,11 +15,5 @@ when: "'elasticsearch' in group_names" - import_playbook: playbooks/deploy_task.yml when: "'task' in group_names" -# - import_playbook: playbooks/deploy_debug.yml -# when: "'debugs' in group_names" -# - import_playbook: playbooks/deploy_consul_manager.yml -# when: "'consul' in group_names" - import_playbook: playbooks/deploy_staging.yml when: "'staging' in group_names" -# - import_playbook: playbooks/deploy_discovery.yml -# when: "'discovery' in inventory_hostname" diff --git a/ansible/playbooks/deploy_task.yml b/ansible/playbooks/deploy_task.yml index c4d494e0b..c8e13a77b 100644 --- a/ansible/playbooks/deploy_task.yml +++ b/ansible/playbooks/deploy_task.yml @@ -13,13 +13,18 @@ version: dashboard3 register: pulled - - name: Reload celery - become: yes - command: "docker kill --signal=HUP {{ item.service_name }}" - when: item.service_name in inventory_hostname - with_items: - - service_name: task-celery - - service_name: task-work + - block: + - name: Reload celery + become: yes + command: "docker kill --signal=HUP {{ item.service_name }}" + when: item.service_name in inventory_hostname + with_items: + - service_name: task-celery + - service_name: task-work + rescue: + - name: Restart celery + become: yes + command: "docker start task-work" - name: Stop celery become: yes diff --git a/ansible/playbooks/deploy_work.yml b/ansible/playbooks/deploy_work.yml deleted file mode 100644 index 0a3329cca..000000000 --- a/ansible/playbooks/deploy_work.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: DEPLOY -> work - hosts: work - gather_facts: false - vars_files: - - ../env_vars/base.yml - - tasks: - - name: Pull newsblur_web github - git: - repo: https://github.com/samuelclay/NewsBlur.git - dest: /srv/newsblur/ - version: dashboard3 - register: pulled - - - name: Reload celery - become: yes - command: "docker kill --signal=HUP task-work" - when: '"task-work" in inventory_hostname' diff --git a/docker/monitor/Dockerfile b/docker/monitor/Dockerfile index 496c28b0e..0be565fe6 100644 --- a/docker/monitor/Dockerfile +++ b/docker/monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM python:3.9-slim WORKDIR /srv/newsblur ENV PYTHONPATH=/srv/newsblur COPY flask_monitor/requirements.txt /srv/newsblur/ diff --git a/utils/monitor_disk_usage.py b/utils/monitor_disk_usage.py index 2802412de..0fadb6126 100755 --- a/utils/monitor_disk_usage.py +++ b/utils/monitor_disk_usage.py @@ -5,7 +5,7 @@ sys.path.append('/srv/newsblur') import subprocess import requests -from newsblur import settings +from newsblur_web import settings import socket def main(): diff --git a/utils/monitor_newsletter_delivery.py b/utils/monitor_newsletter_delivery.py index 7d29027c1..7cafb09ba 100755 --- a/utils/monitor_newsletter_delivery.py +++ b/utils/monitor_newsletter_delivery.py @@ -5,7 +5,7 @@ sys.path.append('/srv/newsblur') import subprocess import requests -from newsblur import settings +from newsblur_web import settings import socket def main(): diff --git a/utils/monitor_redis_bgsave.py b/utils/monitor_redis_bgsave.py index 36caa6a4a..d45cfcc48 100755 --- a/utils/monitor_redis_bgsave.py +++ b/utils/monitor_redis_bgsave.py @@ -6,7 +6,7 @@ sys.path.append('/srv/newsblur') import os import datetime import requests -from newsblur import settings +from newsblur_web import settings import socket def main(): diff --git a/utils/monitor_task_fetches.py b/utils/monitor_task_fetches.py index 396bf05ab..f0405be9e 100755 --- a/utils/monitor_task_fetches.py +++ b/utils/monitor_task_fetches.py @@ -5,7 +5,7 @@ sys.path.append('/srv/newsblur') import subprocess import requests -from newsblur import settings +from newsblur_web import settings import socket import redis import pymongo diff --git a/utils/monitor_work_queue.py b/utils/monitor_work_queue.py index ebafeac51..4a1443a43 100755 --- a/utils/monitor_work_queue.py +++ b/utils/monitor_work_queue.py @@ -5,7 +5,7 @@ sys.path.append('/srv/newsblur') import subprocess import requests -from newsblur import settings +from newsblur_web import settings import socket import redis import pymongo