diff --git a/openprocurement/chronograph/scheduler.py b/openprocurement/chronograph/scheduler.py index 952958f..0850315 100644 --- a/openprocurement/chronograph/scheduler.py +++ b/openprocurement/chronograph/scheduler.py @@ -177,8 +177,9 @@ def check_tender(tender, db): except ResourceConflict: planned = False auctionPeriod = randomize(auctionPeriod).isoformat() - days = skipped_days(skip_days) - LOG.info('Planned auction for tender {} to {}'.format(tender['id'], auctionPeriod)) + days = skipped_days((parse_date(auctionPeriod) - tenderPeriodEnd).days) + log_extra = {'MESSAGE_ID': 'Planned_auction_for_tender', 'JOURNAL_PLANNED_DATE': auctionPeriod, 'JOURNAL_PLANNED_STREAM': stream, 'JOURNAL_PLANNED_DAYS_SKIPPED':(parse_date(auctionPeriod) - tenderPeriodEnd).days } + LOG.info('Planned auction for tender {} to {}. Stream {}. {}'.format(tender['id'], auctionPeriod, stream, days), extra=log_extra) return {'auctionPeriod': {'startDate': auctionPeriod}}, now elif tender.get('lots') and tender['status'] == 'active.tendering' and not tender.get('auctionPeriod') and tenderPeriodEnd and tenderPeriodEnd > now: quick = os.environ.get('SANDBOX_MODE', False) and u'quick' in tender.get('submissionMethodDetails', '') @@ -224,8 +225,9 @@ def check_tender(tender, db): except ResourceConflict: planned = False auctionPeriod = randomize(auctionPeriod).isoformat() - days = skipped_days(skip_days) - LOG.info('Planned auction for tender {} to {}'.format(tender['id'], auctionPeriod)) + days = skipped_days((parse_date(auctionPeriod) - tenderPeriodEnd).days) + log_extra = {'MESSAGE_ID': 'Planned_auction_for_tender', 'JOURNAL_PLANNED_DATE': auctionPeriod, 'JOURNAL_PLANNED_STREAM': stream, 'JOURNAL_PLANNED_DAYS_SKIPPED':(parse_date(auctionPeriod) - tenderPeriodEnd).days } + LOG.info('Planned auction for tender {} to {}. Stream {}.{}'.format(tender['id'], auctionPeriod, stream, days), extra=log_extra) return {'auctionPeriod': {'startDate': auctionPeriod}}, now elif not tender.get('lots') and tender['status'] == 'active.auction' and tender.get('auctionPeriod'): tenderAuctionStart = parse_date(tender.get('auctionPeriod', {}).get('startDate'), TZ).astimezone(TZ) @@ -240,8 +242,9 @@ def check_tender(tender, db): except ResourceConflict: planned = False auctionPeriod = randomize(auctionPeriod).isoformat() - days = skipped_days(skip_days) - LOG.info('Replanned auction for tender {} to {}'.format(tender['id'], auctionPeriod)) + days = skipped_days((parse_date(auctionPeriod) - tenderPeriodEnd).days) + log_extra = {'MESSAGE_ID': 'Planned_auction_for_tender', 'JOURNAL_PLANNED_DATE': auctionPeriod, 'JOURNAL_PLANNED_STREAM': stream, 'JOURNAL_PLANNED_DAYS_SKIPPED':(parse_date(auctionPeriod) - tenderPeriodEnd).days } + LOG.info('Replanned auction for tender {} to {}. Stream {}.{}'.format(tender['id'], auctionPeriod, stream, days), extra=log_extra) return {'auctionPeriod': {'startDate': auctionPeriod}}, now else: return None, tenderAuctionEnd + MIN_PAUSE