zuul
/
zuul
Code Issues Proposed changes

Merge "Bump APScheduler to >=3.0"

This commit is contained in:
Jenkins 2016-01-04 03:41:30 +00:00 committed by Gerrit Code Review
parent f5b2b291b6 1a4ad06770
commit 4e248f21c5
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -12,7 +12,7 @@ extras
statsd>=1.0.0,<3.0
voluptuous>=0.7
gear>=0.5.7,<1.0.0
apscheduler>=2.1.1,<3.0
apscheduler>=3.0
PrettyTable>=0.6,<0.8
babel>=1.0
six>=1.6.0

20
zuul/trigger/timer.py
View File

@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import apscheduler.scheduler
from apscheduler.schedulers.background import BackgroundScheduler
from apscheduler.triggers.cron import CronTrigger
import logging
import voluptuous as v
from zuul.model import EventFilter, TriggerEvent
@ -26,7 +27,7 @@ class TimerTrigger(BaseTrigger):
def __init__(self, trigger_config={}, sched=None, connection=None):
super(TimerTrigger, self).__init__(trigger_config, sched, connection)
self.apsched = apscheduler.scheduler.Scheduler()
self.apsched = BackgroundScheduler()
self.apsched.start()
def _onTrigger(self, pipeline_name, timespec):
@ -62,7 +63,7 @@ class TimerTrigger(BaseTrigger):
def postConfig(self):
for job in self.apsched.get_jobs():
self.apsched.unschedule_job(job)
job.remove()
for pipeline in self.sched.layout.pipelines.values():
for ef in pipeline.manager.event_filters:
if ef.trigger != self:
@ -81,14 +82,11 @@ class TimerTrigger(BaseTrigger):
second = parts[5]
else:
second = None
self.apsched.add_cron_job(self._onTrigger,
day=dom,
day_of_week=dow,
hour=hour,
minute=minute,
second=second,
args=(pipeline.name,
timespec,))
trigger = CronTrigger(day=dom, day_of_week=dow, hour=hour,
minute=minute, second=second)
self.apsched.add_job(self._onTrigger, trigger=trigger,
args=(pipeline.name, timespec,))
def getSchema():