shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Fixed Calendar Actions L2

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-10-26 13:20:16 +02:00
parent 861258532d
commit 43157d722f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/uds/models/CalendarAction.py
View File

@ -34,7 +34,7 @@
from __future__ import unicode_literals
__updated__ = '2017-03-10'
__updated__ = '2018-10-26'
from django.utils.translation import ugettext_lazy as _
from django.db import models
@ -64,6 +64,7 @@ CALENDAR_ACTION_MAX = { 'id': 'MAX', 'description': _('Set maximum number of ser
CALENDAR_ACTION_DICT = dict(list((c['id'], c) for c in (CALENDAR_ACTION_PUBLISH, CALENDAR_ACTION_CACHE_L1,
CALENDAR_ACTION_CACHE_L2, CALENDAR_ACTION_INITIAL, CALENDAR_ACTION_MAX)))
@python_2_unicode_compatible
class CalendarAction(UUIDModel):
calendar = models.ForeignKey(Calendar, on_delete=models.CASCADE)
@ -97,7 +98,7 @@ class CalendarAction(UUIDModel):
if CALENDAR_ACTION_CACHE_L1['id'] == self.action:
self.service_pool.cache_l1_srvs = int(params['size'])
elif CALENDAR_ACTION_CACHE_L2['id'] == self.action:
self.service_pool.cache_l1_srvs = int(params['size'])
self.service_pool.cache_l2_srvs = int(params['size'])
elif CALENDAR_ACTION_INITIAL['id'] == self.action:
self.service_pool.initial_srvs = int(params['size'])
elif CALENDAR_ACTION_MAX['id'] == self.action:
@ -113,14 +114,12 @@ class CalendarAction(UUIDModel):
if saveServicePool:
self.service_pool.save()
def save(self, *args, **kwargs):
self.next_execution = calendar.CalendarChecker(self.calendar).nextEvent(checkFrom=self.last_execution, startEvent=self.at_start, offset=self.offset)
return UUIDModel.save(self, *args, **kwargs)
def __str__(self):
return 'Calendar of {}, last_execution = {}, next execution = {}, action = {}, params = {}'.format(
self.service_pool.name, self.last_execution, self.next_execution, self.action, self.params
)
)