From 5eea1c6b76d79b8949d0884dbd52657408f9e8f3 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 14 Jul 2021 21:45:12 -0400 Subject: [PATCH] Mongo optime format namespaced under 'ts'. --- ansible/roles/monitor/tasks/main.yml | 5 +++++ flask_monitor/db_monitor.py | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ansible/roles/monitor/tasks/main.yml b/ansible/roles/monitor/tasks/main.yml index 53a325295..568c84172 100644 --- a/ansible/roles/monitor/tasks/main.yml +++ b/ansible/roles/monitor/tasks/main.yml @@ -55,3 +55,8 @@ - name: newsblurnet ports: - "5579:5579" + +- name: Restart monitor + become: yes + shell: + cmd: docker restart monitor diff --git a/flask_monitor/db_monitor.py b/flask_monitor/db_monitor.py index 2a0d491cf..e6e907476 100644 --- a/flask_monitor/db_monitor.py +++ b/flask_monitor/db_monitor.py @@ -88,10 +88,10 @@ def db_check_mongo(): member_state = member['state'] optime = member['optime'] if member_state == PRIMARY_STATE: - primary_optime = optime['ts'] + primary_optime = optime['ts'].time elif member_state == SECONDARY_STATE: - if not oldest_secondary_optime or optime['ts'] < oldest_secondary_optime: - oldest_secondary_optime = optime['ts'] + if not oldest_secondary_optime or optime['ts'].time < oldest_secondary_optime: + oldest_secondary_optime = optime['ts'].time if not primary_optime or not oldest_secondary_optime: abort(505)