Cleaning up deploy work and monitors. The task monitors need to be integrate with the flask db monitors.

.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
+grafana.ini

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"

ansible/playbooks/deploy_task.yml

@@ -13,13 +13,18 @@
         version: dashboard3
       register: pulled
     
-    - name: Reload celery
+    - block:
-      become: yes
+        - name: Reload celery
-      command: "docker kill --signal=HUP {{ item.service_name }}"
+          become: yes
-      when: item.service_name in inventory_hostname
+          command: "docker kill --signal=HUP {{ item.service_name }}"
-      with_items:
+          when: item.service_name in inventory_hostname
-        - service_name: task-celery
+          with_items:
-        - service_name: task-work
+            - service_name: task-celery
+            - service_name: task-work
+      rescue:
+        - name: Restart celery
+          become: yes
+          command: "docker start task-work"
 
     - name: Stop celery
       become: yes

ansible/playbooks/deploy_work.yml

@@ -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'

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/

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():

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():

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():

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

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