chibicitiberiu/ytsm
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/ytsm.git synced 2024-02-24 05:43:31 +00:00
Code Issues Releases Wiki Activity

Fixed issue where scheduler was not initialized after setup wizard. Also fixed issue where global synchronization wasn't updated when the admin settings are changed.

Browse Source
This commit is contained in:
Tiberiu Chibici 2018-12-31 13:53:25 +02:00
parent 070755f119
commit f879583637
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/YtManagerApp/management/jobs/synchronize.py
View File

@ -148,10 +148,22 @@ def synchronize_subscription(subscription: Subscription):
__lock.release() __lock.release()
__global_sync_job = None
def schedule_synchronize_global(): def schedule_synchronize_global():
global __global_sync_job
trigger = CronTrigger.from_crontab(appconfig.sync_schedule) trigger = CronTrigger.from_crontab(appconfig.sync_schedule)
job = scheduler.add_job(synchronize, trigger, max_instances=1, coalesce=True)
log.info('Scheduled synchronize job job=%s', job.id) if __global_sync_job is None:
trigger = CronTrigger.from_crontab(appconfig.sync_schedule)
__global_sync_job = scheduler.add_job(synchronize, trigger, max_instances=1, coalesce=True)
else:
__global_sync_job.reschedule(trigger, max_instances=1, coalesce=True)
log.info('Scheduled synchronize job job=%s', __global_sync_job.id)
def schedule_synchronize_now(): def schedule_synchronize_now():

3
app/YtManagerApp/scheduler.py
View File

@ -9,6 +9,9 @@ scheduler = BackgroundScheduler()
def initialize_scheduler(): def initialize_scheduler():
if scheduler.running:
return
logger = logging.getLogger('scheduler') logger = logging.getLogger('scheduler')
executors = { executors = {
'default': { 'default': {

8
app/YtManagerApp/views/first_time.py
View File

@ -9,6 +9,8 @@ from django.urls import reverse_lazy
from django.views.generic import FormView from django.views.generic import FormView
from YtManagerApp.management.appconfig import appconfig from YtManagerApp.management.appconfig import appconfig
from YtManagerApp.management.jobs.synchronize import schedule_synchronize_global
from YtManagerApp.scheduler import initialize_scheduler
from YtManagerApp.views.forms.auth import ExtendedAuthenticationForm from YtManagerApp.views.forms.auth import ExtendedAuthenticationForm
from YtManagerApp.views.forms.first_time import WelcomeForm, ApiKeyForm, PickAdminUserForm, ServerConfigForm, DoneForm, UserCreationForm from YtManagerApp.views.forms.first_time import WelcomeForm, ApiKeyForm, PickAdminUserForm, ServerConfigForm, DoneForm, UserCreationForm
@ -174,7 +176,11 @@ class Step3ConfigureView(WizardStepMixin, FormView):
# Set initialized to true # Set initialized to true
appconfig.initialized = True appconfig.initialized = True
# Start scheduler if not started
initialize_scheduler()
schedule_synchronize_global()
return super().form_valid(form) return super().form_valid(form)

2
app/YtManagerApp/views/settings.py
View File

@ -3,6 +3,7 @@ from django.http import HttpResponseForbidden
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.views.generic import FormView from django.views.generic import FormView
from YtManagerApp.management.jobs.synchronize import schedule_synchronize_global
from YtManagerApp.views.forms.settings import SettingsForm, AdminSettingsForm from YtManagerApp.views.forms.settings import SettingsForm, AdminSettingsForm
@ -44,4 +45,5 @@ class AdminSettingsView(LoginRequiredMixin, FormView):
def form_valid(self, form): def form_valid(self, form):
form.save() form.save()
schedule_synchronize_global()
return super().form_valid(form) return super().form_valid(form)