Skip to content

compose: kill the sendmail process on timeout #138

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

Open
laarmen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

compose: kill the sendmail process on timeout #138

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
9 changes: 6 additions & 3 deletions dodo/compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,12 @@ def run(self) -> None:
if sendmail.stdin:
sendmail.stdin.write(eml.as_string())
sendmail.stdin.close()
sendmail.wait(30)
try:
sendmail.wait(timeout=30)
except TimeoutExpired:
sendmail.terminate()
self.panel.set_status("timed out", color="fg_bad")
return
if sendmail.returncode == 0:
# save to sent folder
if isinstance(settings.sent_dir, dict):
Expand All @@ -465,8 +470,6 @@ def run(self) -> None:
self.panel.set_status("sent", color="fg_good")
else:
self.panel.set_status("error", color="fg_bad")
except TimeoutExpired:
self.panel.set_status("timed out", color="fg_bad")
except pgp_util.GpgError as e:
self.panel.set_status(f"GPG error: {e}", color="fg_bad")
except Exception as e:
Expand Down