update InactiveExpiredSubAccountsWorkerTimer

Author: SkywalkerSpace

dtable_events/tasks/inactive_expired_sub_account_worker.py

@@ -1,6 +1,7 @@
 import os
 import logging
-from threading import Thread, Event
+from threading import Thread
+from apscheduler.schedulers.blocking import BlockingScheduler
 
 from dtable_events.utils import get_python_executable, run
 from dtable_events.app.config import dtable_web_dir
@@ -21,42 +22,39 @@ class InactiveExpiredSubAccountsWorker(object):
 
     def __init__(self, config):
         self._enabled = ENABLE_SUB_ACCOUNT
-        self._interval = 12 * 3600  # 12h
 
     def start(self):
         if not self._enabled:
-            logging.warning('Can not start inactive expired sub accounts: it is not enabled!')
+            logging.info('Can not start inactive expired sub accounts: it is not enabled!')
             return
         logging.info('Start inactive expired sub accounts.')
 
-        InactiveExpiredSubAccountsWorkerTimer(interval=self._interval).start()
+        InactiveExpiredSubAccountsWorkerTimer().start()
 
 
 class InactiveExpiredSubAccountsWorkerTimer(Thread):
 
-    def __init__(self, interval):
+    def __init__(self):
         Thread.__init__(self)
-        self._interval = interval
-        self.finished = Event()
 
     def run(self):
-        while not self.finished.is_set():
-            self.finished.wait(self._interval)
-            if not self.finished.is_set():
-                logging.info('Starts inactive expired sub accounts...')
-                try:
-                    python_exec = get_python_executable()
-                    manage_py = os.path.join(dtable_web_dir, 'manage.py')
-
-                    cmd = [
-                        python_exec,
-                        manage_py,
-                        'inactive_expired_sub_accounts',
-                    ]
-                    with open(self._logfile, 'a') as fp:
-                        run(cmd, cwd=dtable_web_dir, output=fp)
-                except Exception as e:
-                    logging.exception('error when inactive expired sub accounts: %s', e)
-
-    def cancel(self):
-        self.finished.set()
+        sched = BlockingScheduler()
+        # fire at 0 o'clock in every day of week
+        @sched.scheduled_job('cron', day_of_week='*', hour='0', minute='1', misfire_grace_time=600)
+        def timed_job():
+            logging.info('Starts inactive expired sub accounts...')
+            try:
+                python_exec = get_python_executable()
+                manage_py = os.path.join(dtable_web_dir, 'manage.py')
+
+                cmd = [
+                    python_exec,
+                    manage_py,
+                    'inactive_expired_sub_accounts',
+                ]
+                with open(self._logfile, 'a') as fp:
+                    run(cmd, cwd=dtable_web_dir, output=fp)
+            except Exception as e:
+                logging.exception('error when inactive expired sub accounts: %s', e)
+
+        sched.start()