From 596aaa139394e7f4c3c92a09ffd66c9ad9f85f32 Mon Sep 17 00:00:00 2001 From: pablo Date: Tue, 5 May 2020 11:36:28 +0200 Subject: [PATCH] . --- capturer/capturer.py | 14 +++++++++----- core/config.py | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/capturer/capturer.py b/capturer/capturer.py index 2f131a5..455eb15 100644 --- a/capturer/capturer.py +++ b/capturer/capturer.py @@ -25,14 +25,18 @@ class Capturer: logging.info("Starting capturer") while True: - if ( - self.seconds_since_last_try() < minimum_seconds_between_tries() - or not self.in_working_hours() - ): - sleep(Capturer.sleep_time_no_work) + if not self.in_working_hours(): + sleep(1800) logging.info("Waiting...") continue + seconds_to_next_capture = ( + minimum_seconds_between_tries() - self.seconds_since_last_try() + ) + if seconds_to_next_capture > 0: + sleep(seconds_to_next_capture) + logging.info("Waiting...") + pending_task = capturing_interface.get_pending_task() if not pending_task: continue diff --git a/core/config.py b/core/config.py index aba79c9..7afe90c 100644 --- a/core/config.py +++ b/core/config.py @@ -33,11 +33,11 @@ except KeyError: current_db_parameters = databases["default"] working_hours = {"start": datetime.time(9, 0, 0), "end": datetime.time(23, 0, 0)} -monthly_new_ads_target = 1200 +monthly_new_ads_target = 3000 #TODO back to 1200 google_api_key = "AIzaSyCnKj0WnsxVZcaoxeAYkuRw3cKRNGiISYA" def seconds_generator(): - return max(random.randint(120, 360) + random.normalvariate(0, 120), random.randint(10, 20)) + return max(random.randint(90, 180) + random.normalvariate(0, 120), random.randint(10, 20)) minimum_seconds_between_tries = seconds_generator geocoder_delay = 10