separate out won job function
This commit is contained in:
parent
8dc2721efe
commit
66a812ddd6
2 changed files with 21 additions and 3 deletions
|
@ -75,7 +75,6 @@ class EvaluateWonGiveaways:
|
||||||
txt = f"🟡 No won games to evaluate"
|
txt = f"🟡 No won games to evaluate"
|
||||||
logger.info(txt)
|
logger.info(txt)
|
||||||
|
|
||||||
logger.info("Evaluating won giveaways")
|
|
||||||
for item in won_game_list:
|
for item in won_game_list:
|
||||||
won_giveaway = WonEntry(item)
|
won_giveaway = WonEntry(item)
|
||||||
w = GiveawayHelper.get_by_giveaway_id(won_giveaway.giveaway_game_id)
|
w = GiveawayHelper.get_by_giveaway_id(won_giveaway.giveaway_game_id)
|
||||||
|
|
|
@ -50,12 +50,13 @@ class GiveawayThread(threading.Thread):
|
||||||
sleep(10)
|
sleep(10)
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
self._won_page_job_function = EvaluateWonGiveaways(cookie, user_agent, notification).start
|
|
||||||
won_giveaway_job = self._scheduler.get_job(job_id=self.won_giveaway_job_id)
|
won_giveaway_job = self._scheduler.get_job(job_id=self.won_giveaway_job_id)
|
||||||
if won_giveaway_job:
|
if won_giveaway_job:
|
||||||
logger.debug("Previous won giveaway evaluator job exists. Removing.")
|
logger.debug("Previous won giveaway evaluator job exists. Removing.")
|
||||||
won_giveaway_job.remove()
|
won_giveaway_job.remove()
|
||||||
self._scheduler.add_job(self._won_page_job_function,
|
won_runner = GiveawayThread.WonRunner(EvaluateWonGiveaways(cookie, user_agent, notification),
|
||||||
|
self.won_giveaway_job_id)
|
||||||
|
self._scheduler.add_job(won_runner.run,
|
||||||
id=self.won_giveaway_job_id,
|
id=self.won_giveaway_job_id,
|
||||||
trigger='interval',
|
trigger='interval',
|
||||||
max_instances=1,
|
max_instances=1,
|
||||||
|
@ -95,6 +96,24 @@ class GiveawayThread(threading.Thread):
|
||||||
if self.exc:
|
if self.exc:
|
||||||
raise self.exc
|
raise self.exc
|
||||||
|
|
||||||
|
class WonRunner:
|
||||||
|
def __init__(self, won_page, job_id):
|
||||||
|
self._won_page = won_page
|
||||||
|
self._job_id = job_id
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
logger.info(" 💍 Evaluating won giveaways. 💍")
|
||||||
|
if self._won_page:
|
||||||
|
self._won_page.start()
|
||||||
|
logger.info(" 💍 All won giveaways evaluated. 💍")
|
||||||
|
scheduler = Scheduler()
|
||||||
|
evaluate_giveaway_job = scheduler.get_job(job_id=self._job_id)
|
||||||
|
if evaluate_giveaway_job:
|
||||||
|
when_to_start_again = evaluate_giveaway_job.next_run_time
|
||||||
|
logger.info(f"💍 Going to sleep. Will start again at {when_to_start_again}")
|
||||||
|
else:
|
||||||
|
logger.info("No set time to evaluate won giveaways again.")
|
||||||
|
|
||||||
class GiveawayRunner:
|
class GiveawayRunner:
|
||||||
|
|
||||||
def __init__(self, wishlist_page, all_page, job_id):
|
def __init__(self, wishlist_page, all_page, job_id):
|
||||||
|
|
Loading…
Reference in a new issue