From 6e3cdf5ff6a6fdb7e5750ca496211d6c5c8259e1 Mon Sep 17 00:00:00 2001 From: MiloslavskiySergey Date: Tue, 26 Jul 2022 11:41:52 +0300 Subject: [PATCH] fix: name report --- .gitignore | 3 ++- generate_word/generate_file.py | 2 +- send_message/send_email.py | 3 ++- task.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3490156..499bcc5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,11 @@ poetry.lock .env # VuePress files +docs/ docs/.vuepress/.temp/ docs/.vuepress/.cache/ docs/.vuepress/dist/ -docs/* + # Dist files dist/ diff --git a/generate_word/generate_file.py b/generate_word/generate_file.py index c9d4011..e93eeb3 100644 --- a/generate_word/generate_file.py +++ b/generate_word/generate_file.py @@ -16,6 +16,6 @@ def create_report(counter: int, avg_load: float, max_load: float, site_name: str } ) current_date = (date.today() - timedelta(days=1)).strftime('%d-%m-%Y') - path_report = join(get_settings().static_dir, f'{current_date}-{site_name}.docx') + path_report = join(get_settings().static_dir, f"{current_date}-{site_name.replace('/', '').replace('https:', '')}.docx") template_word.save(path_report) return path_report diff --git a/send_message/send_email.py b/send_message/send_email.py index 75ab23c..504df03 100644 --- a/send_message/send_email.py +++ b/send_message/send_email.py @@ -17,7 +17,8 @@ async def send_file( current_date = (date.today() - timedelta(days=1)).strftime('%d-%m-%Y') message = MIMEMultipart() message['Subject'] = 'Отчет о состоянии IT-инфраструктуры и результатах ' \ - f'мониторинга инцидентов в области кибербезопасности сайта {site_name}.' + f"мониторинга инцидентов в области кибербезопасности сайта " \ + f"{site_name.replace('/', '').replace('https:', '')}." message['From'] = sender message['To'] = receivers diff --git a/task.py b/task.py index 338bda0..a84aa65 100644 --- a/task.py +++ b/task.py @@ -39,8 +39,8 @@ async def send_message(): sleep(1) -# schedule.every().day.at(f'{NOTIFICATION_SEND_TIME}').do(send_message) -schedule.every(20).seconds.do(send_message) +schedule.every().day.at(f'{NOTIFICATION_SEND_TIME}').do(send_message) +# schedule.every(20).seconds.do(send_message) while True: get_event_loop().run_until_complete(schedule.run_pending())