NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-31 12:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/reaction' into 'dev'

Browse Source 
Fix reaction tasks not firing

See merge request crafty-controller/crafty-4!423
This commit is contained in:
Iain Powrie 2022-08-14 16:34:35 +00:00
commit dab0957d3d
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,9 +3,9 @@
### New features ### New features
TBD TBD
### Bug fixes ### Bug fixes
TBD - Fix reaction tasks not firing ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
- QOL task delay offset not following over on task edit ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
### Tweaks ### Tweaks
TBD
### Lang ### Lang
TBD TBD
<br><br> <br><br>

4
app/classes/shared/tasks.py
View File

@ -3,7 +3,7 @@ import time
import logging import logging
import threading import threading
import asyncio import asyncio
from datetime import datetime import datetime
from tzlocal import get_localzone from tzlocal import get_localzone
from tzlocal.utils import ZoneInfoNotFoundError from tzlocal.utils import ZoneInfoNotFoundError
@ -199,7 +199,7 @@ class TasksManager:
"interval", "interval",
hours=12, hours=12,
id="update_watcher", id="update_watcher",
start_date=datetime.now(), start_date=datetime.datetime.now(),
) )
# self.scheduler.add_job( # self.scheduler.add_job(
# self.scheduler.print_jobs, "interval", seconds=10, id="-1" # self.scheduler.print_jobs, "interval", seconds=10, id="-1"

2
app/classes/web/panel_handler.py
View File

@ -962,6 +962,7 @@ class PanelHandler(BaseHandler):
page_data["schedule"]["command"] = "" page_data["schedule"]["command"] = ""
page_data["schedule"]["one_time"] = False page_data["schedule"]["one_time"] = False
page_data["schedule"]["cron_string"] = "" page_data["schedule"]["cron_string"] = ""
page_data["schedule"]["delay"] = 0
page_data["schedule"]["time"] = "" page_data["schedule"]["time"] = ""
page_data["schedule"]["interval"] = "" page_data["schedule"]["interval"] = ""
# we don't need to check difficulty here. # we don't need to check difficulty here.
@ -1041,6 +1042,7 @@ class PanelHandler(BaseHandler):
page_data["schedule"]["command"] = schedule.command page_data["schedule"]["command"] = schedule.command
else: else:
page_data["schedule"]["command"] = "" page_data["schedule"]["command"] = ""
page_data["schedule"]["delay"] = schedule.delay
page_data["schedule"]["enabled"] = schedule.enabled page_data["schedule"]["enabled"] = schedule.enabled
page_data["schedule"]["one_time"] = schedule.one_time page_data["schedule"]["one_time"] = schedule.one_time
page_data["schedule"]["cron_string"] = schedule.cron_string page_data["schedule"]["cron_string"] = schedule.cron_string

3
app/frontend/templates/panel/server_schedule_edit.html
View File

@ -136,7 +136,8 @@
<label for="delay">{{ translate('serverScheduleConfig', 'offset' , data['lang']) }} <small <label for="delay">{{ translate('serverScheduleConfig', 'offset' , data['lang']) }} <small
class="text-muted ml-1"> - {{ translate('serverScheduleConfig', 'offset-explain' , class="text-muted ml-1"> - {{ translate('serverScheduleConfig', 'offset-explain' ,
data['lang']) }}</small> </label> data['lang']) }}</small> </label>
<input type="number" class="form-control" name="delay" id="delay" value="0"> <input type="number" class="form-control" name="delay" id="delay"
value="{{ data['schedule']['delay']}}">
<br> <br>
<br> <br>
<label for="parent">{{ translate('serverScheduleConfig', 'parent' , data['lang']) }} <small <label for="parent">{{ translate('serverScheduleConfig', 'parent' , data['lang']) }} <small