Skip to content

fix: name report #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiloslavskiySergey merged 1 commit into from
Jul 26, 2022
Merged

fix: name report #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ poetry.lock
.env

# VuePress files
docs/
docs/.vuepress/.temp/
docs/.vuepress/.cache/
docs/.vuepress/dist/
docs/*


# Dist files
dist/
Expand Down
2 changes: 1 addition & 1 deletion generate_word/generate_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion send_message/send_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down