From 717896d92e534436a711c97eaa3610d5ce73357e Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Sun, 21 Dec 2025 11:10:24 +0100 Subject: [PATCH 1/2] use contact_list_2025-11-28 contact list --- mail/mail_reader_all_contacts.py | 4 +++- request_sender_test.py | 10 ++++------ scheduler_test.py | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mail/mail_reader_all_contacts.py b/mail/mail_reader_all_contacts.py index 5708a17..291c0a7 100644 --- a/mail/mail_reader_all_contacts.py +++ b/mail/mail_reader_all_contacts.py @@ -411,7 +411,9 @@ def find_links_to_validate_from_mail_list(mail_list: List[MailAddress], logger) if __name__ == '__main__': # 读取联系人列表 contact_to_book_list = read_contacts( - file_name="~/Desktop/contact_list_2025-11-06.xlsx") + file_name="~/Desktop/contact_list_2025-11-28.xlsx") + # file_name="~/Desktop/contact_list_all.xlsx") + # file_name="~/Desktop/contact_list_2025-11-06.xlsx") # 获取目标邮箱列表 all_mail_list = MONGO_STORE_MANAGER.get_destination_emails() diff --git a/request_sender_test.py b/request_sender_test.py index 6536087..42a7690 100644 --- a/request_sender_test.py +++ b/request_sender_test.py @@ -99,11 +99,9 @@ def send_request_for_file_list(file_list: list, thread_number: int = 20, data_qu if __name__ == '__main__': # file_list = ['~/Desktop/contact_list_2024-05-23.xlsx', # '~/Desktop/contact_list_2024-05-21.xlsx', - # '~/Desktop/15_05_to_test.xlsx'] # file_list = ['~/Desktop/contact_list_2025-10-30.xlsx'] - file_list = ['~/Desktop/contact_list_2025-11-06.xlsx'] + file_list = ['~/Desktop/contact_list_2025-11-28.xlsx'] + # file_list = ['~/Desktop/contact_list_2025-11-06.xlsx'] # file_list = ['~/Desktop/contact_list_all.xlsx'] - # file_list = ['~/Desktop/contact_list_2025-09-08.xlsx'] - # file_list = ['~/Desktop/real_name_contacts_100_aol_17_04.xlsx'] - send_request_for_file_list(file_list=file_list, thread_number=30, - data_queue_name=MORNING_DATA_CACHE, stop_at_hour=19, stop_at_mins=50) + send_request_for_file_list(file_list=file_list, thread_number=20, + data_queue_name=MORNING_DATA_CACHE_2, stop_at_hour=19, stop_at_mins=50) diff --git a/scheduler_test.py b/scheduler_test.py index cf91547..cda2fd1 100644 --- a/scheduler_test.py +++ b/scheduler_test.py @@ -7,13 +7,13 @@ from request_sender_test import send_request_for_file_list def start_book_appointment(): # file_list = ['~/Desktop/contact_list_2025-09-08.xlsx'] - file_list = ['~/Desktop/contact_list_2025-11-06.xlsx'] - send_request_for_file_list(file_list=file_list, thread_number=70, + file_list = ['~/Desktop/contact_list_2025-11-28.xlsx'] + send_request_for_file_list(file_list=file_list, thread_number=73, data_queue_name=MORNING_DATA_CACHE, stop_at_hour=11, stop_at_mins=10) def start_check_results_job(sched): - sched.add_job(start_book_appointment, 'cron', day_of_week='mon-sat', hour='10', + sched.add_job(start_book_appointment, 'cron', day_of_week='mon-sun', hour='10', minute='30', misfire_grace_time=10, second='10', timezone='Europe/Paris', max_instances=1, args=[]) From 0719dbdf89301efa8dbf8827d7b80b7172c7313a Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Sun, 21 Dec 2025 23:09:46 +0100 Subject: [PATCH 2/2] migrate 2 queues to bak queue --- migrate_cached_request_data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/migrate_cached_request_data.py b/migrate_cached_request_data.py index 9238407..5882901 100644 --- a/migrate_cached_request_data.py +++ b/migrate_cached_request_data.py @@ -4,10 +4,10 @@ from queue_message.CookiesPublisher import MORNING_DATA_CACHE_2, MORNING_DATA_CA from workers.MessagerTransporter import migrate_message_to_queue if __name__ == '__main__': - # p1 = Process(target=migrate_message_to_queue, args=(MORNING_DATA_CACHE_2, MORNING_DATA_CACHE_BAK)) - # p1.start() + p1 = Process(target=migrate_message_to_queue, args=(MORNING_DATA_CACHE_2, MORNING_DATA_CACHE_BAK)) + p1.start() p2 = Process(target=migrate_message_to_queue, args=(MORNING_DATA_CACHE, MORNING_DATA_CACHE_BAK)) p2.start() - # p2.join() + p2.join() # migrate_message_to_queue(from_queue=MORNING_DATA_CACHE_2) # migrate_message_to_queue(from_queue=MORNING_DATA_CACHE)