Merge branch 'feature/4_33_0'

This commit is contained in:
2024-08-26 12:22:32 +02:00
3 changed files with 18 additions and 17 deletions
+4 -4
View File
@@ -57,7 +57,7 @@ def send_appointment_request(message_queue_name, _contact_list, stop_at_hour=11,
logger.info(_contact) logger.info(_contact)
_cookiesPublisher = CookiesPublisher(queue_name=message_queue_name) _cookiesPublisher = CookiesPublisher(queue_name=message_queue_name)
_cookiesPublisher.set_up_connection() _cookiesPublisher.set_up_connection()
_backUp_cookiesPublisher = CookiesPublisher(queue_name=MORNING_DATA_CACHE_2) _backUp_cookiesPublisher = CookiesPublisher(queue_name=MORNING_DATA_CACHE_BAK)
_backUp_cookiesPublisher.set_up_connection() _backUp_cookiesPublisher.set_up_connection()
receiver = AppointmentRequestSender(sub_contact_list=_contact_list, receiver = AppointmentRequestSender(sub_contact_list=_contact_list,
queue_name=message_queue_name, queue_name=message_queue_name,
@@ -104,6 +104,6 @@ if __name__ == '__main__':
# '~/Desktop/contact_list_2024-05-21.xlsx', # '~/Desktop/contact_list_2024-05-21.xlsx',
# '~/Desktop/15_05_to_test.xlsx'] # '~/Desktop/15_05_to_test.xlsx']
# file_list = ['~/Desktop/15_05_to_test.xlsx', '~/Desktop/16_05_to_test.xlsx'] # file_list = ['~/Desktop/15_05_to_test.xlsx', '~/Desktop/16_05_to_test.xlsx']
file_list = ['~/Desktop/contact_list_all.xlsx'] file_list = ['~/Desktop/contact_list_2024-08-22_aol.xlsx']
send_request_for_file_list(file_list=file_list, thread_number=1, send_request_for_file_list(file_list=file_list, thread_number=5,
data_queue_name=MORNING_DATA_CACHE_2, stop_at_hour=17, stop_at_mins=30) data_queue_name=MORNING_DATA_CACHE_2, stop_at_hour=18, stop_at_mins=30)
+12 -11
View File
@@ -6,17 +6,18 @@ from proxy_manager.proxy_manager import ProxyManager
def get_address_ip(proxy_to_use): def get_address_ip(proxy_to_use):
try: return ""
response = requests.get(url="https://api.ipify.org", proxies=proxy_to_use, verify=False, # try:
timeout=15) # response = requests.get(url="https://api.ipify.org", proxies=proxy_to_use, verify=False,
print(response.status_code) # timeout=15)
if response.status_code == 200: # print(response.status_code)
return response.text # if response.status_code == 200:
else: # return response.text
return "" # else:
except Exception as Error: # return ""
print(Error) # except Exception as Error:
return "error" # print(Error)
# return "error"
if __name__ == '__main__': if __name__ == '__main__':
+2 -2
View File
@@ -215,8 +215,8 @@ def validate_all_links():
divided = 3 divided = 3
default_segment_number = 20 default_segment_number = 20
_first_25_percent_links = all_link_list[0:(int(len(all_link_list) / divided))] _first_25_percent_links = all_link_list[0:(int(len(all_link_list) / divided))]
_queue_name = MORNING_DATA_CACHE_2 # _queue_name = MORNING_DATA_CACHE_2
# _queue_name = MORNING_DATA_CACHE_BAK _queue_name = MORNING_DATA_CACHE_BAK
if len(all_link_list) > divided * default_segment_number: if len(all_link_list) > divided * default_segment_number:
_segment_number = default_segment_number _segment_number = default_segment_number
else: else: