From 15452767ef24426837b4320893bdfa0bfd5b0b22 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Wed, 15 Jan 2020 20:59:45 +0000 Subject: [PATCH] fix bad import and change update script --- api/tacticalrmm/tacticalrmm/celery.py | 2 -- update.sh | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/tacticalrmm/tacticalrmm/celery.py b/api/tacticalrmm/tacticalrmm/celery.py index 9385e7db..48e2459a 100644 --- a/api/tacticalrmm/tacticalrmm/celery.py +++ b/api/tacticalrmm/tacticalrmm/celery.py @@ -28,7 +28,6 @@ def setup_periodic_tasks(sender, **kwargs): cpu_load_check_alert, mem_check_alert, win_service_check_task, - determine_agent_status, checks_failing_task, ) @@ -36,5 +35,4 @@ def setup_periodic_tasks(sender, **kwargs): sender.add_periodic_task(10.0, cpu_load_check_alert.s()) sender.add_periodic_task(10.0, mem_check_alert.s()) sender.add_periodic_task(10.0, win_service_check_task.s()) - sender.add_periodic_task(60.0, determine_agent_status.s()) sender.add_periodic_task(7.0, checks_failing_task.s()) diff --git a/update.sh b/update.sh index 66bf2429..88e9202e 100644 --- a/update.sh +++ b/update.sh @@ -6,7 +6,9 @@ sudo systemctl stop ${i} done cd /home/${USER}/rmm/ -git pull +git fetch origin develop +git reset --hard FETCH_HEAD +git clean -df source /home/${USER}/rmm/api/env/bin/activate cd /home/${USER}/rmm/api/tacticalrmm pip install -r /home/${USER}/rmm/api/tacticalrmm/requirements.txt