|
@@ -6,18 +6,6 @@ import sys
|
|
|
from app import SCHEDULER, LOGGER, RESOURCE_NAMES, job_storage, jobs
|
|
|
|
|
|
|
|
|
-def add_check_resources(state_id, capital_id, resource_id, do_refill, minute):
|
|
|
- """Add check resources job"""
|
|
|
- LOGGER.info('Add check for "%s", resource "%s" at "%s"', state_id, resource_id, minute)
|
|
|
- SCHEDULER.add_job(
|
|
|
- jobs.check_resources,
|
|
|
- 'cron',
|
|
|
- args=[state_id, capital_id, resource_id, do_refill],
|
|
|
- id='{}_check_{}'.format(state_id, resource_id),
|
|
|
- replace_existing=True,
|
|
|
- minute=minute
|
|
|
- )
|
|
|
-
|
|
|
if __name__ == '__main__':
|
|
|
# jobs.refill_resource(2788, 4002, 0)
|
|
|
# jobs.check_resources(2788, 4002, 0, False) # VN
|
|
@@ -27,12 +15,24 @@ if __name__ == '__main__':
|
|
|
|
|
|
JOBS = job_storage.get_jobs()
|
|
|
for job in JOBS:
|
|
|
- add_check_resources(
|
|
|
+ LOGGER.info(
|
|
|
+ 'Add check for "%s", resource "%s" at "%s"',
|
|
|
job['state_id'],
|
|
|
- job['capital_id'],
|
|
|
- RESOURCE_NAMES[job['resource_type']],
|
|
|
- job['refill'],
|
|
|
- job['minutes']
|
|
|
+ job['resource_id'],
|
|
|
+ job['minute']
|
|
|
+ )
|
|
|
+ SCHEDULER.add_job(
|
|
|
+ jobs.check_resources,
|
|
|
+ 'cron',
|
|
|
+ args=[
|
|
|
+ job['state_id'],
|
|
|
+ job['capital_id'],
|
|
|
+ RESOURCE_NAMES[job['resource_type']],
|
|
|
+ job['refill']
|
|
|
+ ],
|
|
|
+ id='{}_check_{}'.format(job['state_id'], job['resource_type']),
|
|
|
+ replace_existing=True,
|
|
|
+ minute=job['minutes']
|
|
|
)
|
|
|
|
|
|
SCHEDULER.add_job(
|