Skip to content

as the sender of mail handler is invalid, fix this use default sender… #10

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
jeffery9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

as the sender of mail handler is invalid, fix this use default sender… #10

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
2 changes: 1 addition & 1 deletion trapperkeeper/callbacks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def _send_mail(self, handler, trap, is_duplicate):
ctxt = dict(trap=trap, dest_host=self.hostname)
try:
stats.incr("mail_sent_attempted", 1)
send_trap_email(recipients, "trapperkeeper",
send_trap_email(recipients, "trapperkeeper@localhost",
Copy link
Contributor

@gmjosack gmjosack Sep 23, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be turned into a config option. I currently use a mail relay that automatically appends the domain so this would negatively affect my installation as proposed. If you want to change this to be a config option with the default remaining trapperkeeper then I'll gladly merge this.

subject, self.template_env, ctxt)
stats.incr("mail_sent_successful", 1)
except socket.error as err:
Expand Down