Finish porting the workers over to apscheduler 3.0

util/expiration.py

@@ -16,16 +16,17 @@ class ExpirationScheduler(object):
     soon = datetime.now() + timedelta(seconds=1)
 
     if utc_create_notifications_date > datetime.utcnow():
-      self._scheduler.add_date_job(model.delete_all_notifications_by_kind, soon,
-                                   ['expiring_license'])
+      self._scheduler.add_job(model.delete_all_notifications_by_kind, 'date', run_date=soon,
+                              args=['expiring_license'])
 
       local_notifications_date = self._utc_to_local(utc_create_notifications_date)
-      self._scheduler.add_date_job(self._generate_notifications, local_notifications_date)
+      self._scheduler.add_job(self._generate_notifications, 'date',
+                              run_date=local_notifications_date)
     else:
-      self._scheduler.add_date_job(self._generate_notifications, soon)
+      self._scheduler.add_job(self._generate_notifications, 'date', run_date=soon)
 
     local_termination_date = self._utc_to_local(utc_terminate_processes_date)
-    self._scheduler.add_date_job(self._terminate, local_termination_date)
+    self._scheduler.add_job(self._terminate, 'date', run_date=local_termination_date)
 
   @staticmethod
   def _format_date(date):
@@ -52,25 +53,3 @@ class ExpirationScheduler(object):
 
   def start(self):
     self._scheduler.start()
-
-
-class Expiration(object):
-  def __init__(self, app=None):
-    self.app = app
-    if app is not None:
-      self.state = self.init_app(app)
-    else:
-      self.state = None
-
-  def init_app(self, app):
-    expiration = ExpirationScheduler(app.config['LICENSE_EXPIRATION_WARNING'],
-                                     app.config['LICENSE_EXPIRATION'])
-    expiration.start()
-
-    # register extension with app
-    app.extensions = getattr(app, 'extensions', {})
-    app.extensions['expiration'] = expiration
-    return expiration
-
-  def __getattr__(self, name):
-    return getattr(self.state, name, None)