summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-12-03 13:46:47 +0100
committerschneefux <schneefux+commit@schneefux.xyz>2014-12-03 13:46:47 +0100
commita2863d22795c0ab626aa2e494694ff640c94b718 (patch)
tree8fc9c72aca0a705e86452f9f5770b3ba90a47a2f
parentbb0880be651d2478e8eab013a61eff8384f6e002 (diff)
parent39b7e23a8079cd40d71d9bef0371bf20c5156f4b (diff)
downloadjasper-client-a2863d22795c0ab626aa2e494694ff640c94b718.tar.gz
jasper-client-a2863d22795c0ab626aa2e494694ff640c94b718.zip
Merge pull request #257 from Holzhaus/apscheduler-bump-to-v3
Migrate from APScheduler 2.1.2 to 3.0.1
-rw-r--r--client/notifier.py6
-rw-r--r--client/requirements.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/client/notifier.py b/client/notifier.py
index 941ae6b..a896784 100644
--- a/client/notifier.py
+++ b/client/notifier.py
@@ -2,7 +2,7 @@
import Queue
import atexit
from modules import Gmail
-from apscheduler.scheduler import Scheduler
+from apscheduler.schedulers.background import BackgroundScheduler
import logging
@@ -30,9 +30,9 @@ class Notifier(object):
self._logger.warning('gmail_address or gmail_password not set ' +
'in profile, Gmail notifier will not be used')
- sched = Scheduler(daemon=True)
+ sched = BackgroundScheduler(timezone="UTC", daemon=True)
sched.start()
- sched.add_interval_job(self.gather, seconds=30)
+ sched.add_job(self.gather, 'interval', seconds=30)
atexit.register(lambda: sched.shutdown(wait=False))
def gather(self):
diff --git a/client/requirements.txt b/client/requirements.txt
index f3508fe..0986983 100644
--- a/client/requirements.txt
+++ b/client/requirements.txt
@@ -1,4 +1,4 @@
-APScheduler==2.1.2
+APScheduler==3.0.1
PyYAML==3.10
argparse==1.2.1
beautifulsoup4==4.2.1